pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404369
This commit is contained in:
Ryan C. Gordon 2010-01-06 20:58:03 +00:00
parent 8fbed4b846
commit 3876de9f47
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 # else
# define DECLSPEC __declspec(dllexport) # define DECLSPEC __declspec(dllexport)
# endif # endif
# elif defined(__OS2__)
# ifdef BUILD_SDL
# define DECLSPEC __declspec(dllexport)
# else
# define DECLSPEC
# endif
# else # else
# if defined(__GNUC__) && __GNUC__ >= 4 # if defined(__GNUC__) && __GNUC__ >= 4
# define DECLSPEC __attribute__ ((visibility("default"))) # define DECLSPEC __attribute__ ((visibility("default")))
@ -63,11 +69,18 @@
/* By default SDL uses the C calling convention */ /* By default SDL uses the C calling convention */
#ifndef SDLCALL #ifndef SDLCALL
#if defined(__WIN32__) && !defined(__GNUC__) # if defined(__WIN32__) && !defined(__GNUC__)
#define SDLCALL __cdecl # define SDLCALL __cdecl
#else # elif defined(__OS2__)
#define SDLCALL /* Use the _System calling convention to be compatible with every OS/2
#endif 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 */ #endif /* SDLCALL */
/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */ /* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */