minor updates from windows, getting gnu windows to compile slightly further

[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 c149e18b943dd795046fe267591ebd8d61ea265c..5bc2a87efac523fd7443040f1f16500e423117c0 100644 (file)
--- a/octopi/library/sockets/raw_socket.cpp
+++ b/octopi/library/sockets/raw_socket.cpp
@@ -126,7 +126,7 @@ 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_long *)argp);
+  return ioctlsocket(socket, request, (un_int *)argp);
 #endif
 }
 
@@ -196,7 +196,7 @@ bool raw_socket::set_keep_alive(basis::un_int socket, bool keep_alive)
 
 int raw_socket::select(basis::un_int socket, int mode, int timeout) const
 {
-//  FUNCDEF("select [single]");
+  FUNCDEF("select [single]");
   if (!socket) return SI_ERRONEOUS;
   fd_set_wrapper read_list, write_list, exceps;
   int ret = inner_select(socket, mode, timeout, read_list, write_list, exceps);
@@ -210,25 +210,31 @@ int raw_socket::inner_select(basis::un_int socket, int mode, int timeout,
     fd_set_wrapper &read_list, fd_set_wrapper &write_list,
     fd_set_wrapper &exceptions) const
 {
-#ifdef DEBUG_RAW_SOCKET
   FUNCDEF("inner_select");
-#endif
   // setup the file descriptor sets for the select.  we check readability,
   // writability and exception status.
   FD_ZERO(&read_list); FD_SET(socket, &read_list);
   FD_ZERO(&write_list); FD_SET(socket, &write_list);
   FD_ZERO(&exceptions); FD_SET(socket, &exceptions);
 
-  timeval time_out = time_stamp::fill_timeval_ms(timeout);
+  timeval base_time_out;
+  time_stamp::fill_timeval_ms(base_time_out, timeout);
     // timeval has tv_sec=seconds, tv_usec=microseconds.
+#if !defined(__GNU_WINDOWS__)
+  timeval *time_out = &base_time_out;
+#elif defined(__GNU_WINDOWS__)
+  __ms_timeval win_time_out;
+  win_time_out.tv_sec = base_time_out.tv_sec;
+  win_time_out.tv_usec = base_time_out.tv_usec;
+  __ms_timeval *time_out = &win_time_out;
+#endif
 
   // 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,
-      &exceptions, &time_out);
+      &exceptions, time_out);
   int error = critical_events::system_error();
-
   if (!ret) return 0;  // nothing to report.
 
   if (ret == SOCKET_ERROR) {
@@ -391,14 +397,23 @@ int raw_socket::select(int_array &read_sox, int_array &write_sox,
     FD_SET(sock, &write_list);
   }
 
-  timeval time_out = time_stamp::fill_timeval_ms(timeout);
+  timeval base_time_out;
+  time_stamp::fill_timeval_ms(base_time_out, timeout);
     // timeval has tv_sec=seconds, tv_usec=microseconds.
+#if !defined(__GNU_WINDOWS__)
+  timeval *time_out = &base_time_out;
+#elif defined(__GNU_WINDOWS__)
+  __ms_timeval win_time_out;
+  win_time_out.tv_sec = base_time_out.tv_sec;
+  win_time_out.tv_usec = base_time_out.tv_usec;
+  __ms_timeval *time_out = &win_time_out;
+#endif
 
   // select will tell us about the socket.
   int ret = ::select(highest + 1,
       (read_sox.length())? &read_list : NIL,
       (write_sox.length())? &write_list : NIL,
-      &exceptions, &time_out);
+      &exceptions, time_out);
   int error = critical_events::system_error();
 
   if (ret == SOCKET_ERROR) {