X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcompat.h;h=a4c648909ac3ac5033d960352ad62eae64cd91e2;hb=2404891de8ac5b357d0abde90f2e286a3153fdef;hp=87ad6f88356e968a961de363416d5b44f48227ea;hpb=18770118e846622f59a86f9937a33da0bb761775;p=novacoin.git diff --git a/src/compat.h b/src/compat.h index 87ad6f8..a4c6489 100644 --- a/src/compat.h +++ b/src/compat.h @@ -12,6 +12,9 @@ #define NOMINMAX #endif #ifndef _MSC_VER +#ifdef FD_SETSIZE +#undef FD_SETSIZE +#endif #define FD_SETSIZE 1024 // max number of fds in fd_set #endif #include @@ -20,17 +23,20 @@ #else #include #include +#ifdef ANDROID +#include +#else #include +#endif #include #include #include #include #include -#endif -#ifndef _MSC_VER typedef u_int SOCKET; #endif + #ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 @@ -50,19 +56,4 @@ typedef int socklen_t; #define SOCKET_ERROR -1 #endif -inline int myclosesocket(SOCKET& hSocket) -{ - if (hSocket == INVALID_SOCKET) - return WSAENOTSOCK; -#ifdef WIN32 - int ret = closesocket(hSocket); -#else - int ret = close(hSocket); -#endif - hSocket = INVALID_SOCKET; - return ret; -} -#define closesocket(s) myclosesocket(s) - - -#endif +#endif \ No newline at end of file