diff options
| author | Nick Wellnhofer <wellnhofer@aevum.de> | 2017-10-09 00:20:01 +0200 |
|---|---|---|
| committer | Nick Wellnhofer <wellnhofer@aevum.de> | 2017-10-09 14:35:40 +0200 |
| commit | e3890546d798927aeabdb471985b4afd9f74bbec (patch) | |
| tree | 7bb7fe82edc495987d3f385f9947b764c61e7262 /include/win32config.h | |
| parent | bee8f1e47b0072e8ea216ed08ed819df96812a25 (diff) | |
| download | libxml2-e3890546d798927aeabdb471985b4afd9f74bbec.tar.gz | |
Fix the Windows header mess
Don't include windows.h and wsockcompat.h from config.h but only when
needed.
Don't define _WINSOCKAPI_ manually. This was apparently done to stop
windows.h from including winsock.h which is a problem if winsock2.h
wasn't included first. But on MinGW, this causes compiler warnings.
Define WIN32_LEAN_AND_MEAN instead which has the same effect.
Always use the compiler-defined _WIN32 macro instead of WIN32.
Diffstat (limited to 'include/win32config.h')
| -rw-r--r-- | include/win32config.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/win32config.h b/include/win32config.h index 40cf7df8..85967551 100644 --- a/include/win32config.h +++ b/include/win32config.h @@ -10,7 +10,6 @@ #if defined(_WIN32_WCE) #undef HAVE_ERRNO_H -#include <windows.h> #include "wincecompat.h" #else #define HAVE_SYS_STAT_H @@ -29,10 +28,6 @@ #define ICONV_CONST const #endif -#ifdef NEED_SOCKETS -#include <wsockcompat.h> -#endif - /* * Windows platforms may define except */ |