Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92

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

diff --git a/octopi/library/sockets/raw_socket.cpp b/octopi/library/sockets/raw_socket.cpp
index 5bc2a87efac523fd7443040f1f16500e423117c0..6fb3d6eaabc520670acaf673f006b8e37e40eea6 100644 (file)
--- a/octopi/library/sockets/raw_socket.cpp
+++ b/octopi/library/sockets/raw_socket.cpp
@@ -126,7 +126,11 @@ int raw_socket::ioctl(basis::un_int socket, int request, void *argp) const
   return ::ioctl(socket, request, argp);
 #endif
 #ifdef __WIN32__
-  return ioctlsocket(socket, request, (un_int *)argp);
+  #ifdef _MSC_VER
+    return ioctlsocket(socket, request, (un_long *)argp);
+  #else
+    return ioctlsocket(socket, request, (un_int *)argp);
+  #endif
 #endif
 }
 
@@ -231,8 +235,8 @@ int raw_socket::inner_select(basis::un_int socket, int mode, int timeout,
 
   // select will tell us about the socket.
   int ret = ::select(socket + 1,
-      (mode & SELECTING_JUST_WRITE)? NIL : &read_list,
-      (mode & SELECTING_JUST_READ)? NIL : &write_list,
+      (mode & SELECTING_JUST_WRITE)? NULL_POINTER : &read_list,
+      (mode & SELECTING_JUST_READ)? NULL_POINTER : &write_list,
       &exceptions, time_out);
   int error = critical_events::system_error();
   if (!ret) return 0;  // nothing to report.
@@ -411,8 +415,8 @@ int raw_socket::select(int_array &read_sox, int_array &write_sox,
 
   // select will tell us about the socket.
   int ret = ::select(highest + 1,
-      (read_sox.length())? &read_list : NIL,
-      (write_sox.length())? &write_list : NIL,
+      (read_sox.length())? &read_list : NULL_POINTER,
+      (write_sox.length())? &write_list : NULL_POINTER,
       &exceptions, time_out);
   int error = critical_events::system_error();