include/begin_code.h
branchSDL-1.2
changeset 11966 0c7962a4336f
parent 6203 bc960ba38aae
     1.1 --- a/include/begin_code.h	Sat Mar 24 22:27:31 2018 +0300
     1.2 +++ b/include/begin_code.h	Sat Mar 24 22:28:31 2018 +0300
     1.3 @@ -58,24 +58,11 @@
     1.4  #   define DECLSPEC	__declspec(dllexport)
     1.5  #  endif
     1.6  # elif defined(__OS2__)
     1.7 -#  ifdef __WATCOMC__
     1.8  #   ifdef BUILD_SDL
     1.9  #    define DECLSPEC	__declspec(dllexport)
    1.10  #   else
    1.11  #    define DECLSPEC
    1.12  #   endif
    1.13 -#  elif defined (__GNUC__) && __GNUC__ < 4
    1.14 -#   /* Added support for GCC-EMX <v4.x */
    1.15 -#   /* this is needed for XFree86/OS2 developement */
    1.16 -#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
    1.17 -#   ifdef BUILD_SDL
    1.18 -#    define DECLSPEC    __declspec(dllexport)
    1.19 -#   else
    1.20 -#    define DECLSPEC
    1.21 -#   endif
    1.22 -#  else
    1.23 -#   define DECLSPEC
    1.24 -#  endif
    1.25  # else
    1.26  #  if defined(__GNUC__) && __GNUC__ >= 4
    1.27  #   define DECLSPEC	__attribute__ ((visibility("default")))
    1.28 @@ -93,16 +80,12 @@
    1.29  # if defined(__WIN32__) && !defined(__GNUC__)
    1.30  #  define SDLCALL __cdecl
    1.31  # elif defined(__OS2__)
    1.32 -#  if defined (__GNUC__) && __GNUC__ < 4
    1.33 -#   /* Added support for GCC-EMX <v4.x */
    1.34 -#   /* this is needed for XFree86/OS2 developement */
    1.35 -#   /* F. Ambacher(anakor@snafu.de) 05.2008 */
    1.36 -#   define SDLCALL _cdecl
    1.37 -#  else
    1.38 -#   /* On other compilers on OS/2, we use the _System calling convention */
    1.39 -#   /* to be compatible with every compiler */
    1.40 -#   define SDLCALL _System
    1.41 +   /* But on OS/2, we use the _System calling convention */
    1.42 +   /* to be compatible with every compiler */
    1.43 +#  if defined (__GNUC__) && !defined(_System)
    1.44 +#   define _System /* For compatibility with old GCC/EMX */
    1.45  #  endif
    1.46 +#  define SDLCALL _System
    1.47  # else
    1.48  #  define SDLCALL
    1.49  # endif