diff options
| author | Jack Lloyd <[email protected]> | 2017-09-03 08:10:13 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-09-03 08:10:13 -0400 |
| commit | 20985b242640907de77ea45c7e0b679c3e7ed82e (patch) | |
| tree | e4c7ac75806c6e8ef713bc783ee3c05cf8338216 /src | |
| parent | 27198fc299a2ea899d723b5fb3c3439e1157c3fb (diff) | |
Define macro so windows.h doesn't include winsock.h
Ugh Windows headers y u so nasty.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/entropy/win32_stats/es_win32.cpp | 2 | ||||
| -rw-r--r-- | src/lib/rng/system_rng/system_rng.cpp | 1 | ||||
| -rw-r--r-- | src/lib/utils/dyn_load/dyn_load.cpp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/entropy/win32_stats/es_win32.cpp b/src/lib/entropy/win32_stats/es_win32.cpp index 520848615..0e7056550 100644 --- a/src/lib/entropy/win32_stats/es_win32.cpp +++ b/src/lib/entropy/win32_stats/es_win32.cpp @@ -6,7 +6,9 @@ */ #include <botan/internal/es_win32.h> + #define NOMINMAX 1 +#define _WINSOCKAPI_ // stop windows.h including winsock.h #include <windows.h> #include <tlhelp32.h> diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp index cafdaac78..9ee306991 100644 --- a/src/lib/rng/system_rng/system_rng.cpp +++ b/src/lib/rng/system_rng/system_rng.cpp @@ -10,6 +10,7 @@ #if defined(BOTAN_TARGET_OS_HAS_CRYPTGENRANDOM) #define NOMINMAX 1 + #define _WINSOCKAPI_ // stop windows.h including winsock.h #include <windows.h> #include <wincrypt.h> diff --git a/src/lib/utils/dyn_load/dyn_load.cpp b/src/lib/utils/dyn_load/dyn_load.cpp index 1f33dc761..2b24e5f6c 100644 --- a/src/lib/utils/dyn_load/dyn_load.cpp +++ b/src/lib/utils/dyn_load/dyn_load.cpp @@ -13,6 +13,7 @@ #include <dlfcn.h> #elif defined(BOTAN_TARGET_OS_HAS_LOADLIBRARY) #define NOMINMAX 1 + #define _WINSOCKAPI_ // stop windows.h including winsock.h #include <windows.h> #endif |