From bad8948346e9b8813023a0cc78a3b6eb8d9c14c6 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 16 Mar 2014 15:16:18 -0700 Subject: [PATCH] testsuite: Introduce a __STDCALL__ compiler-specific macro Several tests want to use stdcall, which differs in syntax by compiler, so introduce a macro for it in ffitest.h. --- testsuite/libffi.call/closure_stdcall.c | 5 +---- testsuite/libffi.call/ffitest.h | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testsuite/libffi.call/closure_stdcall.c b/testsuite/libffi.call/closure_stdcall.c index 871d576d..fd1e4b03 100644 --- a/testsuite/libffi.call/closure_stdcall.c +++ b/testsuite/libffi.call/closure_stdcall.c @@ -23,10 +23,7 @@ closure_test_stdcall(ffi_cif* cif __UNUSED__, void* resp, void** args, } -#ifndef _MSC_VER -#define __stdcall __attribute__((stdcall)) -#endif -typedef int (__stdcall *closure_test_type0)(int, int, int, int); +typedef int (__STDCALL__ *closure_test_type0)(int, int, int, int); int main (void) { diff --git a/testsuite/libffi.call/ffitest.h b/testsuite/libffi.call/ffitest.h index 7c0f8e4b..2fc25357 100644 --- a/testsuite/libffi.call/ffitest.h +++ b/testsuite/libffi.call/ffitest.h @@ -21,9 +21,11 @@ #undef __UNUSED__ #if defined(__GNUC__) #define __UNUSED__ __attribute__((__unused__)) +#define __STDCALL__ __attribute__((stdcall)) #define __FASTCALL__ __attribute__((fastcall)) #else #define __UNUSED__ +#define __STDCALL__ __stdcall #define __FASTCALL__ __fastcall #endif