Skip to content

Commit 38f3954

Browse files
committed
Use fake __cdecl where neither __cdecl nor cdecl are available
1 parent d7be0fa commit 38f3954

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

Release/include/cpprest/details/cpprest_compat.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,11 @@
5555
// No SAL on non Windows platforms
5656
#include "cpprest/details/nosal.h"
5757

58-
#if defined(__APPLE__) // Settings specific to Apple
59-
#define __cdecl
58+
#if not defined __cdecl
59+
#if defined cdecl
60+
#define __cdecl __attribute__ ((cdecl))
6061
#else
61-
62-
// Settings specific to Linux and Android
63-
64-
// Ignore cdecl on ANDROID ARM and 64bit
65-
#if defined(__ANDROID__) && defined(__arm__) || defined(__LP64__)
6662
#define __cdecl
67-
#else
68-
#define __cdecl __attribute__ ((cdecl))
6963
#endif
7064

7165
#if defined(__ANDROID__)

0 commit comments

Comments
 (0)