fix for mysql password and samba mod

[feisty_meow.git] / nucleus / library / processes / launch_process.h

diff --git a/nucleus/library/processes/launch_process.h b/nucleus/library/processes/launch_process.h
index a988c4c59bb5b1597b27fac9d1dcd17a0324289b..c13453d42a3f0992e2505e981156c5aeedaeb3da 100644 (file)
--- a/nucleus/library/processes/launch_process.h
+++ b/nucleus/library/processes/launch_process.h
@@ -28,7 +28,7 @@ namespace processes {
 class char_star_array : public basis::array<char *>
 {
 public:
-  char_star_array() : basis::array<char *>(0, NIL, SIMPLE_COPY | EXPONE | FLUSH_INVISIBLE) {}
+  char_star_array() : basis::array<char *>(0, NULL_POINTER, SIMPLE_COPY | EXPONE | FLUSH_INVISIBLE) {}
   ~char_star_array() {
     // clean up all the memory we're holding.
     for (int i = 0; i < length(); i++) {
@@ -81,11 +81,10 @@ public:
     function. */
 
 private:
-#ifdef __UNIX__
+#ifndef _MSC_VER
   static void exiting_child_signal_handler(int sig_num);
     //!< awaits the child processes rather than leaving process handles willy nilly.
-#endif
-#ifdef __WIN32__
+#else
   static bool event_poll(tagMSG &message);
     //!< tries to process one win32 event and retrieve the "message" from it.
     /*!< this is a very general poll and will retrieve any message that's