From 6839d2820fbd6b21362876787b0b215a8f1deda7 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Sat, 24 Mar 2018 22:28:31 +0300
Subject: [PATCH] remove unnecessary restrictions from SDLCALL and DECLSPEC
 macros for OS/2.

---
 include/begin_code.h | 27 +++++----------------------
 include/close_code.h |  1 -
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/include/begin_code.h b/include/begin_code.h
index 27e2f7bc7..1c8a2a03a 100644
--- 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
index 3f2421ca3..9928eec4d 100644
--- a/include/close_code.h
+++ b/include/close_code.h
@@ -43,4 +43,3 @@
 #pragma pack(pop)
 #endif
 #endif /* Compiler needs structure packing set */
-