[Scummvm-git-logs] scummvm master -> f3f508882430221f26d346d532434bf14da9e503

sev- sev at scummvm.org
Fri Feb 9 14:26:46 CET 2018


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f3f5088824 SDL: Do not try to replace FILE with an incompatible type


Commit: f3f508882430221f26d346d532434bf14da9e503
    https://github.com/scummvm/scummvm/commit/f3f508882430221f26d346d532434bf14da9e503
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-02-09T14:26:42+01:00

Commit Message:
SDL: Do not try to replace FILE with an incompatible type

It’s questionable that the SDL backend code is trying so hard to
maintain forbidden symbols at all since backend code is exactly
where such things are allowed, and it is a game of whack-a-mole
to keep system API changes from breaking this fragile system of
symbol redefinitions. Probably this should all just get replaced
with a FORBIDDEN_SYMBOL_ALLOW_ALL, but for the time being this at
least gets builds working again on up-to-date msys2/mingw-w64
compilers.

Fixes Trac#10405.

Changed paths:
    backends/platform/sdl/sdl-sys.h


diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 9ebd123..9b87f5e 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -31,15 +31,8 @@
 
 #include "common/scummsys.h"
 
-// Remove FILE override from common/forbidden.h, and replace
-// 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)





More information about the Scummvm-git-logs mailing list