[Scummvm-git-logs] scummvm master -> 29535c0a55410684a263b493b1c75112f352bab6

[criezy]

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:
29535c0a55 SDL: Do not forbid time.h symbols when FORBIDDEN_SYMBOL_EXCEPTION_time_h is defined


Commit: 29535c0a55410684a263b493b1c75112f352bab6
    https://github.com/scummvm/scummvm/commit/29535c0a55410684a263b493b1c75112f352bab6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-04T02:26:27+01:00

Commit Message:
SDL: Do not forbid time.h symbols when FORBIDDEN_SYMBOL_EXCEPTION_time_h is defined

This hopefully fixes a regression from 848c5c3.

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 a00fcb7..9ebd123 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -69,50 +69,54 @@ typedef struct { int FAKE; } FAKE_FILE;
 
 // Fix compilation with MacPorts SDL 2
 // It needs various (usually forbidden) symbols from time.h
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_asctime)
-#undef asctime
-#define asctime FAKE_asctime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_clock)
-#undef clock
-#define clock FAKE_clock
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_ctime)
-#undef ctime
-#define ctime FAKE_ctime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_difftime)
-#undef difftime
-#define difftime FAKE_difftime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_getdate)
-#undef getdate
-#define getdate FAKE_getdate
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_gmtime)
-#undef gmtime
-#define gmtime FAKE_gmtime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_localtime)
-#undef localtime
-#define localtime FAKE_localtime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_mktime)
-#undef mktime
-#define mktime FAKE_mktime
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_time)
-#undef time
-#define time FAKE_time
-#endif
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_asctime)
+	#undef asctime
+	#define asctime FAKE_asctime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_clock)
+	#undef clock
+	#define clock FAKE_clock
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_ctime)
+	#undef ctime
+	#define ctime FAKE_ctime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_difftime)
+	#undef difftime
+	#define difftime FAKE_difftime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_getdate)
+	#undef getdate
+	#define getdate FAKE_getdate
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_gmtime)
+	#undef gmtime
+	#define gmtime FAKE_gmtime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_localtime)
+	#undef localtime
+	#define localtime FAKE_localtime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_mktime)
+	#undef mktime
+	#define mktime FAKE_mktime
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_time)
+	#undef time
+	#define time FAKE_time
+	#endif
+
+#endif // FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
 // 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
@@ -224,55 +228,54 @@ typedef struct { int FAKE; } FAKE_FILE;
 #endif
 
 // re-forbid all those time.h symbols again (if they were forbidden)
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_asctime)
-#undef asctime
-#define asctime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_asctime)
-#undef asctime
-#define asctime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_clock)
-#undef clock
-#define clock() FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_ctime)
-#undef ctime
-#define ctime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_difftime)
-#undef difftime
-#define difftime(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_getdate)
-#undef getdate
-#define getdate(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_gmtime)
-#undef gmtime
-#define gmtime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_localtime)
-#undef localtime
-#define localtime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_mktime)
-#undef mktime
-#define mktime(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
-
-#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_time)
-#undef time
-#define time(a) FORBIDDEN_SYMBOL_REPLACEMENT
-#endif
+#ifndef FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_asctime)
+	#undef asctime
+	#define asctime(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_clock)
+	#undef clock
+	#define clock() FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_ctime)
+	#undef ctime
+	#define ctime(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_difftime)
+	#undef difftime
+	#define difftime(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_getdate)
+	#undef getdate
+	#define getdate(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_gmtime)
+	#undef gmtime
+	#define gmtime(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_localtime)
+	#undef localtime
+	#define localtime(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_mktime)
+	#undef mktime
+	#define mktime(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+	#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && !defined(FORBIDDEN_SYMBOL_EXCEPTION_time)
+	#undef time
+	#define time(a) FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
+#endif // FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
 // SDL 2 has major API changes. We redefine constants which got renamed to
 // ease the transition. This is sometimes dangerous because the values changed