KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/nine: Clean up WINAPI definition 

As Emil pointed out, only gcc, clang and MSVC compatibility is required.
Hence the check for GNUC can be skipped, as __i386__ and __x86_64__ are
only defined for gcc/clang, not for MSVC.

Remove the #undef which has been there for historic reasons, when wine
dlls for nine have been built inside mesa. Instead use #ifndef in order
to avoid redefining WINAPI from MSVC's headers.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Christian Schmidbauer 2016-04-29 20:53:30 +01:00 committed by Axel Davy
parent 243fd02858
commit f5d6ed5702
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/D3D9/d3d9types.h
View File

@ -173,22 +173,16 @@ typedef struct _RGNDATA {
#define D3DPRESENTFLAG_RESTRICTED_CONTENT 0x00000400
#define D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER 0x00000800
#ifdef WINAPI
#undef WINAPI
#endif /* WINAPI*/
#ifdef __GNUC__
#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64)
/* Windows calling convention */
#ifndef WINAPI
#if defined(__x86_64__) && !defined(__ILP32__)
#define WINAPI __attribute__((ms_abi))
#elif defined(__i386) || defined(_M_IX86)
#elif defined(__i386__)
#define WINAPI __attribute__((__stdcall__))
#else /* neither amd64 nor i386 */
#define WINAPI
#endif
#else /* __GNUC__ */
#define WINAPI
#endif
#endif /* WINAPI */
/* Implementation caps */
#define D3DPRESENT_BACK_BUFFERS_MAX 3