Mercurial > sdl-ios-xcode

diff include/SDL_syswm.h @ 1626:a80e1e0880b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #176 [I'm fixing this for the public headers, but I'm not going to bother for the SDL library code (yet)] To clarify: Normaly, GCC (or, to be precise, the preprocessor) will ignore this, and compile the code happily. However, one can specify -Wundef to get a warning about this. One can probably argue whether to consider this a bug or not; but I think that (a) from a semantic point of view, using "#if FOO" when FOO is not defined is strange, and (b) since it is possible to trigger a warning about this, and a trivial fix exists, it should be corrected. I can think of two alternative patches, BTW: 1) Simply use #define HAVE_FOO 0, instead of not defining HAVE_FOO at all 2) Change #if HAVE_FOO to #if HAVE_FOO+0 which always does the right thing. But I think I still prefer the attached patch :-).
author Sam Lantinga <slouken@libsdl.org>
date Thu, 13 Apr 2006 13:38:40 +0000
parents dc6b59e925a2
children 14717b52abc0
line wrap: on
line diff
--- a/include/SDL_syswm.h	Thu Apr 13 13:30:21 2006 +0000
+++ b/include/SDL_syswm.h	Thu Apr 13 13:38:40 2006 +0000
@@ -46,7 +46,7 @@
 #else
 
 /* This is the structure for custom window manager events */
-#if SDL_VIDEO_DRIVER_X11
+#if defined(SDL_VIDEO_DRIVER_X11)
 #if defined(__APPLE__) && defined(__MACH__)
 /* conflicts with Quickdraw.h */
 #define Cursor X11Cursor
@@ -100,7 +100,7 @@
 	} info;
 } SDL_SysWMinfo;
 
-#elif SDL_VIDEO_DRIVER_NANOX
+#elif defined(SDL_VIDEO_DRIVER_NANOX)
 #include <microwin/nano-X.h>
 
 /* The generic custom event structure */
@@ -115,7 +115,7 @@
 	GR_WINDOW_ID window ;	/* The display window */
 } SDL_SysWMinfo;
 
-#elif SDL_VIDEO_DRIVER_WINDIB || SDL_VIDEO_DRIVER_DDRAW
+#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
@@ -135,7 +135,7 @@
 	HGLRC hglrc;			/* The OpenGL context, if any */
 } SDL_SysWMinfo;
 
-#elif SDL_VIDEO_DRIVER_RISCOS
+#elif defined(SDL_VIDEO_DRIVER_RISCOS)
 
 /* RISC OS custom event structure */
 struct SDL_SysWMmsg {
@@ -152,7 +152,7 @@
 	int window;		/* The RISC OS display window */
 } SDL_SysWMinfo;
 
-#elif SDL_VIDEO_DRIVER_PHOTON
+#elif defined(SDL_VIDEO_DRIVER_PHOTON)
 #include <sys/neutrino.h>
 #include <Ph.h>