diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-04 13:58:05 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-04 13:58:05 -0700 |
| commit | 6a049687841d87fc5bbd0fb0a192f03776f67630 (patch) | |
| tree | ddb5d24f705b0451b948906df697082b9f47d0a3 /include | |
| parent | fe247bbe922ab862914bc76c10557157a06700ac (diff) | |
| parent | 88ef2476dcdd61000cbae7ded9c8fa52927429d8 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'include')
| -rw-r--r-- | include/D3D9/d3d9types.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h index d74ce80bb3..e0b86523da 100644 --- a/include/D3D9/d3d9types.h +++ b/include/D3D9/d3d9types.h @@ -178,11 +178,17 @@ typedef struct _RGNDATA { #undef WINAPI #endif /* WINAPI*/ -#if defined(__x86_64__) || defined(_M_X64) -#define WINAPI __attribute__((ms_abi)) -#else /* x86_64 */ -#define WINAPI __attribute__((__stdcall__)) -#endif /* x86_64 */ +#ifdef __GNUC__ + #if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) + #define WINAPI __attribute__((ms_abi)) + #elif defined(__i386) || defined(_M_IX86) + #define WINAPI __attribute__((__stdcall__)) + #else /* neither amd64 nor i386 */ + #define WINAPI + #endif +#else /* __GNUC__ */ + #define WINAPI +#endif /* Implementation caps */ #define D3DPRESENT_BACK_BUFFERS_MAX 3 |