X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=octopi%2Flibrary%2Fsockets%2Ftcpip_definitions.h;h=e6f6cca2a2d1dc0ee4bfc998730c4ee751f88736;hb=39dbe2cabfc181def8903f6009ed967ad2dc1d9b;hp=6a1492108f0b75d8eec1eec44f195d078c246f0e;hpb=e16e899f1a75d8c4df9d36ffac2d8d2d401c4114;p=feisty_meow.git diff --git a/octopi/library/sockets/tcpip_definitions.h b/octopi/library/sockets/tcpip_definitions.h index 6a149210..e6f6cca2 100644 --- 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 -#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 @@ -139,6 +146,7 @@ #define SOCK_TRY_AGAIN WSATRY_AGAIN #define SOCK_VERNOTSUPPORTED WSAVERNOTSUPPORTED #endif +*/ #endif