Merge branch 'release-2.140.136'

[feisty_meow.git] / octopi / library / sockets / tcpip_definitions.h

diff --git a/octopi/library/sockets/tcpip_definitions.h b/octopi/library/sockets/tcpip_definitions.h
index 6a1492108f0b75d8eec1eec44f195d078c246f0e..e6f6cca2a2d1dc0ee4bfc998730c4ee751f88736 100644 (file)
--- a/octopi/library/sockets/tcpip_definitions.h
+++ b/octopi/library/sockets/tcpip_definitions.h
@@ -19,12 +19,18 @@
 * Please send any updates to: fred@gruntose.com                               *
 \*****************************************************************************/
 
-///#include "sockets_dll.h"
+#include <application/windoze_helper.h>
 
-#ifdef __UNIX__
-  // provide some unifying definitions.
-  #define INVALID_SOCKET -1
+#ifndef SOCKET_ERROR 
   #define SOCKET_ERROR -1
+#endif
+
+#ifndef INVALID_SOCKET 
+  #define INVALID_SOCKET -1
+#endif
+
+//#ifdef __UNIX__
+  // provide some unifying definitions.
   typedef void sock_hop;
 
   // provide synonyms for errors so we don't conflict with the windows
@@ -73,8 +79,9 @@
   #define SOCK_ETOOMANYREFS ETOOMANYREFS
   #define SOCK_EWOULDBLOCK EWOULDBLOCK
   #define SOCK_EUSERS EUSERS
-#endif
+//#endif
 
+  /*
 #ifdef __WIN32__
   #include <application/windoze_helper.h>
 
@@ -139,6 +146,7 @@
   #define SOCK_TRY_AGAIN WSATRY_AGAIN
   #define SOCK_VERNOTSUPPORTED WSAVERNOTSUPPORTED
 #endif
+*/
 
 #endif