diff options
| -rw-r--r-- | include/D3D9/d3d9types.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h index e0b86523daa..88f22b97112 100644 --- a/include/D3D9/d3d9types.h +++ b/include/D3D9/d3d9types.h @@ -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 |