mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-14 12:44:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

st/nine: specify WINAPI only for i386 and amd64

Browse Source 
Currently mesa fails building with the x32 abi as ms_abi is not defined
in such a case.

The patch uses ms_abi only for amd64 targets and stdcall only for i386
targets to be sure that those are defined.

This patch additionally checks for __GNUC__ to guarantee that
__attribute__ is available.

CC: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Christian Schmidbauer <ch.schmidbauer@gmail.com>
Acked-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Christian Schmidbauer 2016-03-13 22:50:31 +01:00 committed by Axel Davy
parent 0852c5703b
commit 2a529a8ac8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/D3D9/d3d9types.h
View File

@ -178,11 +178,17 @@ typedef struct _RGNDATA {
#undef WINAPI #undef WINAPI
#endif /* WINAPI*/ #endif /* WINAPI*/
#if defined(__x86_64__) || defined(_M_X64) #ifdef __GNUC__
#define WINAPI __attribute__((ms_abi)) #if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64)
#else /* x86_64 */ #define WINAPI __attribute__((ms_abi))
#define WINAPI __attribute__((__stdcall__)) #elif defined(__i386) || defined(_M_IX86)
#endif /* x86_64 */ #define WINAPI __attribute__((__stdcall__))
#else /* neither amd64 nor i386 */
#define WINAPI
#endif
#else /* __GNUC__ */
#define WINAPI
#endif
/* Implementation caps */ /* Implementation caps */
#define D3DPRESENT_BACK_BUFFERS_MAX 3 #define D3DPRESENT_BACK_BUFFERS_MAX 3