diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-08-26 15:09:25 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-08-27 15:11:19 -0600 |
| commit | 73f63d6d5ccb522d93bd1b14d1ff1d39646d84fb (patch) | |
| tree | e6c23da33c34508e0a73841604c92600dbf48ced /include | |
| parent | dc093abf9ba4a3ed01d11b3cc56caccff8c4552b (diff) | |
| download | usermoji-73f63d6d5ccb522d93bd1b14d1ff1d39646d84fb.tar.xz | |
vk_platform: Update to upstream vk_platform.h
Gitlab bug #9: https://gitlab.khronos.org/vulkan/LoaderAndTools/issues/9
noted that the SDK's vk_platform.h did not match the upstream vk_platform.h.
This patch makes them identical updates impacted code.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vk_platform.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/vk_platform.h b/include/vk_platform.h index db9c4f99..969e532e 100644 --- a/include/vk_platform.h +++ b/include/vk_platform.h @@ -40,17 +40,8 @@ extern "C" */ #if defined(_WIN32) - // Ensure we don't pick up min/max macros from Winddef.h - #define NOMINMAX - // On Windows, VKAPI should equate to the __stdcall convention #define VKAPI __stdcall - - // C99: -#ifndef __cplusplus - #undef inline - #define inline __inline -#endif // __cplusplus #elif defined(__GNUC__) // On other platforms using GCC, VKAPI stays undefined #define VKAPI @@ -76,16 +67,6 @@ extern "C" #endif #endif // !defined(VK_NO_STDINT_H) -#if (UINTPTR_MAX >= UINT64_MAX) - #define VK_UINTPTRLEAST64_MAX UINTPTR_MAX - - typedef uintptr_t VkUintPtrLeast64; -#else - #define VK_UINTPTRLEAST64_MAX UINT64_MAX - - typedef uint64_t VkUintPtrLeast64; -#endif - #ifdef __cplusplus } // extern "C" #endif // __cplusplus |