Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-11 03:25:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged r4717:4718 from branches/SDL-1.2: minor OS/2 DECLSPEC/SDLCALL fixes.

Browse Source 
I reworked this a little. The 1.2 branch isn't really very elegant about this.
This commit is contained in:
Ryan C. Gordon
2010-01-06 20:58:03 +00:00
parent 8d46b44026
commit 1fad5ac7c1
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/begin_code.h
View File

@@ -52,6 +52,12 @@
# else
# define DECLSPEC __declspec(dllexport)
# endif
# elif defined(__OS2__)
# ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport)
# else
# define DECLSPEC
# endif
# else
# if defined(__GNUC__) && __GNUC__ >= 4
# define DECLSPEC __attribute__ ((visibility("default")))
@@ -63,11 +69,18 @@
/* By default SDL uses the C calling convention */
#ifndef SDLCALL
#if defined(__WIN32__) && !defined(__GNUC__)
#define SDLCALL __cdecl
#else
#define SDLCALL
#endif
# if defined(__WIN32__) && !defined(__GNUC__)
# define SDLCALL __cdecl
# elif defined(__OS2__)
/* Use the _System calling convention to be compatible with every OS/2
compiler. (Please note that this used to be _cdecl for GCC, but that
was a bug. Someone should go examine and fix the XFree86 integration
instead. We shouldn't be passing SDLCALL function pointers between SDL
and XFree86!) */
# define SDLCALL _System
# else
# define SDLCALL
# endif
#endif /* SDLCALL */
/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */