deep mods

[feisty_meow.git] / nucleus / library / application / hoople_service.cpp

diff --git a/nucleus/library/application/hoople_service.cpp b/nucleus/library/application/hoople_service.cpp
index 969a2c27e719d5688b86fc7a083b272e9fa5d942..1a7ea8d9db25f45b204882e926e77d70d3f09c6c 100644 (file)
--- a/nucleus/library/application/hoople_service.cpp
+++ b/nucleus/library/application/hoople_service.cpp
@@ -58,7 +58,7 @@ int &hoople_service::_timer_period() { static int _tim = 0; return _tim; }
 
 //////////////
 
-static hoople_service *_global_hoople_service = NIL;
+static hoople_service *_global_hoople_service = NULL_POINTER;
   // this static object is set by the setup() method.  it should only come
   // into existence once during a program's lifetime.
 
@@ -113,10 +113,9 @@ bool hoople_service::close_application(const astring &app_name)
   // zap all of them using our signal.
   for (int i = 0; i < pids.length(); i++) {
 //would linux be better served with sigterm also?
-#ifdef __UNIX__
+#ifndef _MSC_VER
     kill(pids[i], SIGHUP);
-#endif
-#ifdef __WIN32__
+#else
 //lame--goes to whole program.
     raise(SIGTERM);
 #endif
@@ -151,13 +150,13 @@ bool hoople_service::setup(const astring &app_name, int timer_period)
 
   // setup signal handler for HUP signal.  this is the one used to tell us
   // to leave.
-#ifdef __UNIX__
+#ifndef _MSC_VER
   signal(SIGHUP, handle_OS_signal);
 #endif
 
   // setup a handler for interrupt (e.g. ctrl-C) also.
   signal(SIGINT, handle_OS_signal);
-#ifdef __WIN32__
+#ifdef _MSC_VER
   signal(SIGBREAK, handle_OS_signal);
 #endif
 
@@ -209,7 +208,7 @@ bool hoople_service::launch_event_loop(hoople_service &alert,
 
   MSG msg;
   msg.hwnd = 0; msg.message = 0; msg.wParam = 0; msg.lParam = 0;
-  while (!alert.is_defunct() && (GetMessage(&msg, NIL, 0, 0)) {
+  while (!alert.is_defunct() && (GetMessage(&msg, NULL_POINTER, 0, 0)) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);
   }