diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:48:35 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-05 01:48:35 -0700 |
| commit | 2af267c150579c5defc3431e6d0d1ee4d6e7af44 (patch) | |
| tree | a477904de4730eb6df50e7737e7c617b29016e8e | |
| parent | e622f3f195f417f3098b9717003f875954495f3c (diff) | |
| parent | dd833a4cd887bda58b8686a61287c342e9c56003 (diff) | |
Merge pull request #2857 from Diapolo/compat_cleanup
cleanup compat.h Windows stuff
| -rw-r--r-- | src/compat.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compat.h b/src/compat.h index 706221692b..4e98b46c1c 100644 --- a/src/compat.h +++ b/src/compat.h @@ -3,7 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef _BITCOIN_COMPAT_H -#define _BITCOIN_COMPAT_H 1 +#define _BITCOIN_COMPAT_H #ifdef WIN32 #define _WIN32_WINNT 0x0501 @@ -13,7 +13,6 @@ #endif #define FD_SETSIZE 1024 // max number of fds in fd_set #include <winsock2.h> -#include <mswsock.h> #include <ws2tcpip.h> #else #include <sys/types.h> @@ -26,12 +25,11 @@ #include <ifaddrs.h> #endif -typedef u_int SOCKET; #ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 -typedef int socklen_t; #else +typedef u_int SOCKET; #include "errno.h" #define WSAGetLastError() errno #define WSAEINVAL EINVAL |