From f3f508882430221f26d346d532434bf14da9e503 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Tue, 30 Jan 2018 19:27:48 -0600 Subject: [PATCH] SDL: Do not try to replace FILE with an incompatible type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- backends/platform/sdl/sdl-sys.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h index 9ebd123bb46a..9b87f5eabdff 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)