diff options
| author | Brandon Dahler <brandon.dahler@gmail.com> | 2013-04-13 00:13:08 -0500 |
|---|---|---|
| committer | Brandon Dahler <brandon.dahler@gmail.com> | 2013-11-10 09:36:28 -0600 |
| commit | 51ed9ec971614aebdbfbd9527aba365dd0afd437 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/compat.h | |
| parent | 7c4c207be8420d394a5abc4368d1bb69ad4f8067 (diff) | |
Cleanup code using forward declarations.
Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.
Diffstat (limited to 'src/compat.h')
| -rw-r--r-- | src/compat.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/compat.h b/src/compat.h index c910f01cb4..1deef493c2 100644 --- a/src/compat.h +++ b/src/compat.h @@ -2,6 +2,7 @@ // Copyright (c) 2009-2013 The Bitcoin developers // 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 @@ -18,17 +19,24 @@ #undef FD_SETSIZE // prevent redefinition compiler warning #endif #define FD_SETSIZE 1024 // max number of fds in fd_set -#include <winsock2.h> + +#include <winsock2.h> // Must be included before mswsock.h and windows.h + +#include <mswsock.h> +#include <windows.h> #include <ws2tcpip.h> #else -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/fcntl.h> #include <arpa/inet.h> -#include <netdb.h> +#include <ifaddrs.h> +#include <limits.h> #include <net/if.h> +#include <netdb.h> #include <netinet/in.h> -#include <ifaddrs.h> +#include <sys/fcntl.h> +#include <sys/mman.h> +#include <sys/socket.h> +#include <sys/types.h> +#include <unistd.h> #endif #ifdef WIN32 |