Merge pull request #1142 from PeterTh/v1.x

Prevent NEAR and FAR macro definitions from leaking on Windows platforms
This commit is contained in:
Gabi Melman 2019-07-10 20:47:59 +03:00 committed by GitHub
commit e0d85e60a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -32,6 +32,10 @@
#include <process.h> // _get_pid support #include <process.h> // _get_pid support
#include <windows.h> #include <windows.h>
// windows.h leaks NEAR and FAR macros, prevent those from leaking further
#undef NEAR
#undef FAR
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <share.h> #include <share.h>
#endif #endif