libs/vkd3d: Disable nameless unions.

This commit is contained in:
Józef Kucia 2016-09-27 12:13:37 +02:00
parent 5e266f70a2
commit e43af70de1
2 changed files with 12 additions and 9 deletions

View File

@ -23,7 +23,6 @@
#ifndef __VKD3D_WINDOWS_H #ifndef __VKD3D_WINDOWS_H
#define __VKD3D_WINDOWS_H #define __VKD3D_WINDOWS_H
#if !defined(_WIN32) || defined(__WIDL__) #if !defined(_WIN32) || defined(__WIDL__)
/* HRESULT */ /* HRESULT */
@ -143,9 +142,6 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
# define DECLSPEC_HIDDEN __attribute__((visibility("hidden"))) # define DECLSPEC_HIDDEN __attribute__((visibility("hidden")))
# endif # endif
# define __C89_NAMELESS
# define __C89_NAMELESSUNIONNAME
/* Macros for COM interfaces */ /* Macros for COM interfaces */
# define interface struct # define interface struct
# define BEGIN_INTERFACE # define BEGIN_INTERFACE
@ -180,11 +176,17 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
# include <windows.h> # include <windows.h>
# ifndef __C89_NAMELESS
# define __C89_NAMELESS
# define __C89_NAMELESSUNIONNAME
# endif /* __C89_NAMELESS */
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifndef __C89_NAMELESS
# ifdef NONAMELESSUNION
# define __C89_NAMELESS
# define __C89_NAMELESSUNIONNAME u
# else
# define __C89_NAMELESS
# define __C89_NAMELESSUNIONNAME
# endif /* NONAMELESSUNION */
#endif /* __C89_NAMELESS */
#endif /* __VKD3D_WINDOWS_H */ #endif /* __VKD3D_WINDOWS_H */

View File

@ -24,6 +24,7 @@
#define __VKD3D_PRIVATE_H #define __VKD3D_PRIVATE_H
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#include "vkd3d_common.h" #include "vkd3d_common.h"
#include "vkd3d_debug.h" #include "vkd3d_debug.h"
#include "vkd3d_vulkan.h" #include "vkd3d_vulkan.h"