diff options
| author | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-11-30 20:44:23 -0500 |
| commit | ede418b67a0f14e4f17a2b03f5362741badd5532 (patch) | |
| tree | 07de039fac5c303f1b9fce372afe5fa19854f547 /backends/platform/sdl/sdl-sys.h | |
| parent | 66d1f7a8de2ff5a21ad013f45924c406f4833e9a (diff) | |
| parent | 3e859768770a0b385e21c4528cd546b33ed9a55d (diff) | |
| download | scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.gz scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.tar.bz2 scummvm-rg350-ede418b67a0f14e4f17a2b03f5362741badd5532.zip | |
VOYEUR: Merge of upstream
Diffstat (limited to 'backends/platform/sdl/sdl-sys.h')
| -rw-r--r-- | backends/platform/sdl/sdl-sys.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h index ca3c586e03..eccf73815d 100644 --- a/backends/platform/sdl/sdl-sys.h +++ b/backends/platform/sdl/sdl-sys.h @@ -35,8 +35,11 @@ // it with an alternate slightly less unfriendly override. #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_FILE) #undef FILE +// Solaris has typedef __FILE FILE in several places already +#if !defined(__sun) typedef struct { int FAKE; } FAKE_FILE; #define FILE FAKE_FILE +#endif // (__sun) #endif #if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_strcasecmp) |