misc: Move snprintf define to vk_sdk_platform.h

Windows doesn't define snprintf so we need to #define
it to what Windows does use in our SDK platform header.

diff --git a/include/vk_sdk_platform.h b/include/vk_sdk_platform.h
old mode 100644 (file)
new mode 100755 (executable)
index 0f9b4ca..d5e31a8
--- a/include/vk_sdk_platform.h
+++ b/include/vk_sdk_platform.h
@@ -34,6 +34,15 @@
 #    undef inline
 #    define inline __inline
 #  endif // __cplusplus
+
+// C99:
+// Microsoft didn't implement C99 in Visual Studio; but started adding it with
+// VS2013.  However, VS2013 still didn't have snprintf().  The following is a
+// work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the
+// "CMakeLists.txt" file).
+#define snprintf _snprintf
+#define strdup _strdup
+
 #endif // _WIN32
 
 #endif // VK_SDK_PLATFORM_H

diff --git a/layers/vk_layer_config.cpp b/layers/vk_layer_config.cpp
old mode 100644 (file)
new mode 100755 (executable)
index e3b6d87..66254c7
--- a/layers/vk_layer_config.cpp
+++ b/layers/vk_layer_config.cpp
@@ -30,7 +30,7 @@
 #include <vk_layer.h>
 #include <iostream>
 #include "vk_layer_config.h"
-#include "vk_loader_platform.h"
+#include "vk_sdk_platform.h"
 
 #define MAX_CHARS_PER_LINE 4096
 

diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index 9a690f5f7b55ec7d638a3f41b8b64e414d95d8ab..960215611bde58535e5d9f392945199096443290 100644 (file)
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -233,16 +233,6 @@ using namespace std;
 #define DEFAULT_VK_LAYERS_PATH "C:\\Windows\\System32;C:\\Windows\\SysWow64"
 #define LAYERS_PATH_ENV "VK_LAYER_PATH"
 
-// C99:
-// Microsoft didn't implement C99 in Visual Studio; but started adding it with
-// VS2013.  However, VS2013 still didn't have snprintf().  The following is a
-// work-around (Note: The _CRT_SECURE_NO_WARNINGS macro must be set in the
-// "CMakeLists.txt" file).
-#define snprintf _snprintf
-#define strdup _strdup
-#define PRINTF_SIZE_T_SPECIFIER    "%Iu"
-
-
 // File IO
 static bool loader_platform_file_exists(const char *path)
 {