X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fcompat.h;h=d0e8114fada9c9bd87fe922ce465cad53fa49dcc;hb=47d3ceb3da845e216fc9577cbf52f8b5600e5f93;hp=79ebb9323a63f8285df49b8277035835f091c4bd;hpb=e10622d1297e638109bbf58c35ad008f7acbae7c;p=novacoin.git diff --git a/src/compat.h b/src/compat.h index 79ebb93..d0e8114 100644 --- a/src/compat.h +++ b/src/compat.h @@ -6,26 +6,36 @@ #define _BITCOIN_COMPAT_H 1 #ifdef WIN32 -#define _WIN32_WINNT 0x0501 +#define _WIN32_WINNT 0x0601 #define WIN32_LEAN_AND_MEAN 1 #ifndef NOMINMAX #define NOMINMAX #endif -#include +#ifndef _MSC_VER +#ifdef FD_SETSIZE +#undef FD_SETSIZE +#endif +#define FD_SETSIZE 1024 // max number of fds in fd_set +#endif #include #include #else #include #include +#ifdef ANDROID +#include +#else #include +#endif #include #include #include #include #include -#endif typedef u_int SOCKET; +#endif + #ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 @@ -45,19 +55,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