diff options
| author | Paul Gilbert | 2016-03-20 14:55:41 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-20 14:55:41 -0400 |
| commit | 3c852cc240221785598023de56e5a71a0d8806fa (patch) | |
| tree | c2a64b811586e4e9d8a4d5baa04d5c4f9d23bd08 /backends/platform/sdl/sdl-sys.h | |
| parent | ea54e6244e75c609e6886ba210f80fb22c479d3f (diff) | |
| parent | 509a00109e79156e91c062f145ac3aa86ec8584e (diff) | |
| download | scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.tar.gz scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.tar.bz2 scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.zip | |
Merge branch 'master' into titanic
Diffstat (limited to 'backends/platform/sdl/sdl-sys.h')
| -rw-r--r-- | backends/platform/sdl/sdl-sys.h | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h index 67ad84efd3..551605a4b4 100644 --- a/backends/platform/sdl/sdl-sys.h +++ b/backends/platform/sdl/sdl-sys.h @@ -52,6 +52,21 @@ typedef struct { int FAKE; } FAKE_FILE; #define strncasecmp FAKE_strncasecmp #endif +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_exit) +#undef exit +#define exit FAKE_exit +#endif + +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_abort) +#undef abort +#define abort FAKE_abort +#endif + +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_system) +#undef system +#define system FAKE_system +#endif + // HACK: SDL might include windows.h which defines its own ARRAYSIZE. // However, we want to use the version from common/util.h. Thus, we make sure // that we actually have this definition after including the SDL headers. @@ -112,7 +127,7 @@ typedef struct { int FAKE; } FAKE_FILE; #endif // In a moment of brilliance Xlib.h included by SDL_syswm.h #defines the -// following names. In a moment of mental breakdown, which occured upon +// following names. In a moment of mental breakdown, which occurred upon // gazing at Xlib.h, LordHoto decided to undefine them to prevent havoc. #ifdef Status #undef Status @@ -146,6 +161,21 @@ typedef struct { int FAKE; } FAKE_FILE; #define strncasecmp FORBIDDEN_SYMBOL_REPLACEMENT #endif +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_exit) +#undef exit +#define exit(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_abort) +#undef abort +#define abort() FORBIDDEN_SYMBOL_REPLACEMENT +#endif + +#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_system) +#undef system +#define system(a) FORBIDDEN_SYMBOL_REPLACEMENT +#endif + // SDL 2 has major API changes. We redefine constants which got renamed to // ease the transition. This is sometimes dangerous because the values changed // too! |