checking in the recent efforts at optimizing clam

[feisty_meow.git] / nucleus / library / loggers / critical_events.cpp

diff --git a/nucleus/library/loggers/critical_events.cpp b/nucleus/library/loggers/critical_events.cpp
index ebb60bb8245bca72e984426ee674318020db7d99..ce955274fb569231360676ccc5637453bdb47a2e 100644 (file)
--- a/nucleus/library/loggers/critical_events.cpp
+++ b/nucleus/library/loggers/critical_events.cpp
@@ -26,9 +26,7 @@
 #include <timely/time_stamp.h>
 
 #include <stdio.h>
-#ifdef __UNIX__
-  #include <errno.h>
-#endif
+#include <errno.h>
 
 using namespace basis;
 using namespace structures;
@@ -54,10 +52,10 @@ SAFE_STATIC(mutex, __critical_event_dir_lock, )
 
 basis::un_int critical_events::system_error()
 {
-#if defined(__UNIX__)
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   return errno;
-#elif defined(__WIN32__)
-  return GetLastError();
+//#elif defined(_MSC_VER)
+//  return GetLastError();
 #else
   #pragma error("hmmm: no code for error number for this operating system")
   return 0;
@@ -66,19 +64,21 @@ basis::un_int critical_events::system_error()
 
 astring critical_events::system_error_text(basis::un_int to_name)
 {
-#if defined(__UNIX__)
+#if defined(__UNIX__) || defined(__GNU_WINDOWS__)
   return strerror(to_name);
-#elif defined(__WIN32__)
+/*
+#elif defined(_MSC_VER)
   char error_text[1000];
-  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NIL, to_name,
+  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL_POINTER, to_name,
       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)error_text,
-      sizeof(error_text) - 1, NIL);
+      sizeof(error_text) - 1, NULL_POINTER);
   astring to_return = error_text;
   // trim off the ridiculous carriage return they add.
   while ( (to_return[to_return.end()] == '\r')
       || (to_return[to_return.end()] == '\n') )
     to_return.zap(to_return.end(), to_return.end());
   return to_return;
+*/
 #else
   #pragma error("hmmm: no code for error text for this operating system")
   return "";
@@ -141,7 +141,7 @@ void critical_events::alert_message(const char *info, const char *title)
 
   to_print += info;
   program_wide_logger::get().log(to_print, ALWAYS_PRINT);
-  fflush(NIL);  // flush all output streams.
+  fflush(NULL_POINTER);  // flush all output streams.
 }
 
 void critical_events::alert_message(const astring &info) { alert_message(info.s()); }