From 3528b2bbd19e1a809bd2b4c9f5c598a1a16affcf Mon Sep 17 00:00:00 2001 From: NagyD Date: Sun, 24 Sep 2017 08:59:05 +0200 Subject: [PATCH] Removed redefinition of SDL_COMPILE_TIME_ASSERT. --- src/types.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/types.h b/src/types.h index bd0ab01d..cee3ebf6 100644 --- a/src/types.h +++ b/src/types.h @@ -39,11 +39,15 @@ The authors of this program may be contacted at http://forum.princed.org #error This program is not (yet) prepared for big endian CPUs, please contact the author. #endif -// This macro is from SDL_types.h. -// It is #undefined at the end of that file, even though it can be useful outside that file. +// This macro is from SDL_types.h / SDL_stdinc.h . +// It used to be #undefined at the end of that file, but since some time in 2006 it's kept available. +// And SDL's definition changed in SDL 2.0.6, which caused a warning at this redefinition. +// So we should just use the macro from SDL and not define our own. /* Make sure the types really have the right sizes */ +/* #define SDL_COMPILE_TIME_ASSERT(name, x) \ typedef int SDL_dummy_ ## name[(x) * 2 - 1] +*/ // "far" and "near" makes sense only for 16-bit #define far