remove unnecessary restrictions from SDLCALL and DECLSPEC macros for …

…OS/2.
libsdl-org · Mar 24, 2018 · 6839d28 · 6839d28
1 parent c220940
commit 6839d28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/include/begin_code.h b/include/begin_code.h
@@ -58,24 +58,11 @@
 #   define DECLSPEC	__declspec(dllexport)
 #  endif
 # elif defined(__OS2__)
-#  ifdef __WATCOMC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC	__declspec(dllexport)
 #   else
 #    define DECLSPEC
 #   endif
-#  elif defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   ifdef BUILD_SDL
-#    define DECLSPEC    __declspec(dllexport)
-#   else
-#    define DECLSPEC
-#   endif
-#  else
-#   define DECLSPEC
-#  endif
 # else
 #  if defined(__GNUC__) && __GNUC__ >= 4
 #   define DECLSPEC	__attribute__ ((visibility("default")))
@@ -93,16 +80,12 @@
 # if defined(__WIN32__) && !defined(__GNUC__)
 #  define SDLCALL __cdecl
 # elif defined(__OS2__)
-#  if defined (__GNUC__) && __GNUC__ < 4
-#   /* Added support for GCC-EMX <v4.x */
-#   /* this is needed for XFree86/OS2 developement */
-#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
-#   define SDLCALL _cdecl
-#  else
-#   /* On other compilers on OS/2, we use the _System calling convention */
-#   /* to be compatible with every compiler */
-#   define SDLCALL _System
+   /* But on OS/2, we use the _System calling convention */
+   /* to be compatible with every compiler */
+#  if defined (__GNUC__) && !defined(_System)
+#   define _System /* For compatibility with old GCC/EMX */
 #  endif
+#  define SDLCALL _System
 # else
 #  define SDLCALL
 # endif

diff --git a/include/close_code.h b/include/close_code.h
@@ -43,4 +43,3 @@
 #pragma pack(pop)
 #endif
 #endif /* Compiler needs structure packing set */
-