AuroraMiddleware/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp synced 2024-11-21 20:00:11 +00:00
Code Issues Releases Wiki Activity

Undefine major and minor through <sys/sysmacros.h>

Browse Source 
<sys/sysmacros.h> is included through some other headers.
This results in major(x) being resolved to gnu_dev_major(x)
which is an expression in a constructor initializer list.
This patch includes <sys/sysmacros.h> at the very beginning,
and undefines major and minor to avoid them to be resolved
to gnu_dev_major(x) or gnu_dev_minor(x).
This commit is contained in:
Gulfem Savrun Yeniceri 2024-11-01 11:17:06 -07:00
parent eaf912017f
commit e98a878b93
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vulkan/vulkan.hpp
View File

@ -8,6 +8,13 @@
#ifndef VULKAN_HPP
#define VULKAN_HPP
// <sys/sysmacros.h> 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 <sys/sysmacros.h>
#undef major
#undef minor
#include <vulkan/vulkan_hpp_macros.hpp>
#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!" );
// <tuple> includes <sys/sysmacros.h> 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 )