updates from orpheus for windoze build

[feisty_meow.git] / octopi / library / sockets / socket_minder.cpp

diff --git a/octopi/library/sockets/socket_minder.cpp b/octopi/library/sockets/socket_minder.cpp
index c99aac96c242fbd7e0389edf70f131c0d6d71c18..8c7036bdd1ac5b0a005b09ff48f00b06737a2fae 100644 (file)
--- a/octopi/library/sockets/socket_minder.cpp
+++ b/octopi/library/sockets/socket_minder.cpp
@@ -28,13 +28,14 @@
 #include <textual/parser_bits.h>
 
 #include <errno.h>
-#ifdef __WIN32__
+/*#ifdef __WIN32__
   #include <ws2tcpip.h>
 #endif
 #ifdef __UNIX__
+*/
   #include <arpa/inet.h>
   #include <sys/socket.h>
-#endif
+//#endif
 
 using namespace basis;
 using namespace loggers;
@@ -81,7 +82,7 @@ public:
   : ethread(SOCKET_CHECK_INTERVAL, ethread::SLACK_INTERVAL),
     _parent(parent)
   {
-    start(NIL);
+    start(NULL_POINTER);
   }
 
   ~socket_minder_prompter() {
@@ -109,7 +110,7 @@ socket_minder::socket_minder(post_office &post, int parent_route,
   _pending_sox(new int_set),
   _prompter(new socket_minder_prompter(*this))
 {
-  _prompter->start(NIL);
+  _prompter->start(NULL_POINTER);
 }
 
 socket_minder::~socket_minder()
@@ -233,13 +234,13 @@ socket_data *socket_minder::lock_socket_data(int socket)
       return _socket_list->borrow(i);
   // this is a failure to get here; there was no suitable socket.
   _lock->unlock();
-  return NIL;
+  return NULL_POINTER;
 }
 
 void socket_minder::unlock_socket_data(socket_data *to_unlock)
 {
   if (!to_unlock) return;
-//can't affect it now.  to_unlock = NIL;
+//can't affect it now.  to_unlock = NULL_POINTER;
   _lock->unlock();
 }