Merge pull request #1142 from PeterTh/v1.x

Prevent NEAR and FAR macro definitions from leaking on Windows platforms

Merge pull request #1142 from PeterTh/v1.x
Prevent NEAR and FAR macro definitions from leaking on Windows platforms
e0d85e60 · Gabi Melman · GitHub · 84809db9 · ac7821f9 · e0d85e60
Unverified Commit e0d85e60 authored Jul 10, 2019 by Gabi Melman Committed by GitHub Jul 10, 2019
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

os-inl.h include/spdlog/details/os-inl.h +4 -0

No files found.
--- a/include/spdlog/details/os-inl.h
+++ b/include/spdlog/details/os-inl.h
@@ -32,6 +32,10 @@
 #include <process.h> //  _get_pid support
 #include <windows.h>

+// windows.h leaks NEAR and FAR macros, prevent those from leaking further
+#undef NEAR
+#undef FAR
+
 #ifdef __MINGW32__
 #include <share.h>
 #endif