Merge pull request #210 from VA-GS/main

NOMINMAX can be defined already on Windows
mas-bandwidth · Oct 7, 2024 · a163cf2 · a163cf2
2 parents c889a85 + c8f3e92
commit a163cf2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/source/yojimbo_address.cpp b/source/yojimbo_address.cpp
@@ -28,7 +28,9 @@
 
 #if YOJIMBO_PLATFORM == YOJIMBO_PLATFORM_WINDOWS
 
+    #ifndef NOMINMAX
     #define NOMINMAX
+    #endif
     #define _WINSOCK_DEPRECATED_NO_WARNINGS
     #include <winsock2.h>
     #include <ws2tcpip.h>

diff --git a/source/yojimbo_platform.cpp b/source/yojimbo_platform.cpp
@@ -168,7 +168,9 @@ double yojimbo_time()
 //             Windows
 // ===============================
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 void yojimbo_sleep( double time )