X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fapplication%2Fhoople_service.cpp;h=d8fa224e0d16c5484717f30dc691618c7371c686;hb=da79480d6d2efe23173e659a4b7a27e29809387b;hp=969a2c27e719d5688b86fc7a083b272e9fa5d942;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git diff --git a/nucleus/library/application/hoople_service.cpp b/nucleus/library/application/hoople_service.cpp index 969a2c27..d8fa224e 100644 --- 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. @@ -112,14 +112,13 @@ 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__ +//hmmm: would linux be better served with sigterm instead, like we used to do for windoze? +//#ifndef _MSC_VER kill(pids[i], SIGHUP); -#endif -#ifdef __WIN32__ -//lame--goes to whole program. - raise(SIGTERM); -#endif +//#else +////lame--goes to whole program. +// raise(SIGTERM); +//#endif //hmmm: check results... } @@ -151,15 +150,15 @@ 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 +//#endif // setup a handler for interrupt (e.g. ctrl-C) also. signal(SIGINT, handle_OS_signal); -#ifdef __WIN32__ - signal(SIGBREAK, handle_OS_signal); -#endif +//#ifdef _MSC_VER +// signal(SIGBREAK, handle_OS_signal); +//#endif return true; } @@ -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); }