diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 8cf7937..5da9185 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -8,6 +8,13 @@ #ifndef VULKAN_HPP #define VULKAN_HPP +// is included through some other headers, and +// this results in major(x) being resolved to gnu_dev_major(x) +// which is an expression in a constructor initializer list. +#include +#undef major +#undef minor + #include #if defined( VULKAN_HPP_ENABLE_STD_MODULE ) && defined( VULKAN_HPP_STD_MODULE ) @@ -65,16 +72,6 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h static_assert( VK_HEADER_VERSION == 300, "Wrong VK_HEADER_VERSION!" ); -// includes through some other header -// this results in major(x) being resolved to gnu_dev_major(x) -// which is an expression in a constructor initializer list. -#if defined( major ) -# undef major -#endif -#if defined( minor ) -# undef minor -#endif - // Windows defines MemoryBarrier which is deprecated and collides // with the VULKAN_HPP_NAMESPACE::MemoryBarrier struct. #if defined( MemoryBarrier )