Merge pull request #147 from res2k/move-some-preproc-defn
Move some preprocessor directives that may influence user code into "implementation" block
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index ac90914..5f621ec 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -2000,16 +2000,6 @@
*/
-#if VMA_RECORDING_ENABLED
- #include <chrono>
- #if defined(_WIN32)
- #include <windows.h>
- #else
- #include <sstream>
- #include <thread>
- #endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -2022,7 +2012,7 @@
#define VMA_RECORDING_ENABLED 0
#endif
-#ifndef NOMINMAX
+#if !defined(NOMINMAX) && defined(VMA_IMPLEMENTATION)
#define NOMINMAX // For windows.h
#endif
@@ -3966,6 +3956,16 @@
#include <cstring>
#include <utility>
+#if VMA_RECORDING_ENABLED
+ #include <chrono>
+ #if defined(_WIN32)
+ #include <windows.h>
+ #else
+ #include <sstream>
+ #include <thread>
+ #endif
+#endif
+
/*******************************************************************************
CONFIGURATION SECTION
