Mercurial > sdl-ios-xcode

diff src/video/Xext/Xinerama/Xinerama.c @ 3633:81dde1b00bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h include fixes.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 10 Jan 2010 18:19:35 +0000
parents c121d94672cb
children
line wrap: on
line diff
--- a/src/video/Xext/Xinerama/Xinerama.c	Sun Jan 10 09:16:46 2010 +0000
+++ b/src/video/Xext/Xinerama/Xinerama.c	Sun Jan 10 18:19:35 2010 +0000
@@ -28,7 +28,12 @@
 #define NEED_EVENTS
 #define NEED_REPLIES
 
+/* Apparently some X11 systems can't include this multiple times... */
+#ifndef SDL_INCLUDED_XLIBINT_H
+#define SDL_INCLUDED_XLIBINT_H 1
 #include <X11/Xlibint.h>
+#endif
+
 #include <X11/Xutil.h>
 #include "../extensions/Xext.h"
 #include "../extensions/extutil.h"      /* in ../include */