# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1263147575 0
# Node ID 81dde1b00bf18ae47ec66067898b2e67a64999c6
# Parent  da2a23b56493cb364bb4baac1848a07590fc969f
Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h include fixes.

diff -r da2a23b56493 -r 81dde1b00bf1 src/video/Xext/XME/xme.c
--- a/src/video/Xext/XME/xme.c	Sun Jan 10 09:16:46 2010 +0000
+++ b/src/video/Xext/XME/xme.c	Sun Jan 10 18:19:35 2010 +0000
@@ -14,7 +14,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/Xthreads.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
diff -r da2a23b56493 -r 81dde1b00bf1 src/video/Xext/Xinerama/Xinerama.c
--- 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 */
diff -r da2a23b56493 -r 81dde1b00bf1 src/video/Xext/Xv/Xvlibint.h
--- a/src/video/Xext/Xv/Xvlibint.h	Sun Jan 10 09:16:46 2010 +0000
+++ b/src/video/Xext/Xv/Xvlibint.h	Sun Jan 10 18:19:35 2010 +0000
@@ -43,7 +43,12 @@
 
 #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 "../extensions/Xvproto.h"
 #include "../extensions/Xvlib.h"
 
diff -r da2a23b56493 -r 81dde1b00bf1 src/video/Xext/Xxf86vm/XF86VMode.c
--- a/src/video/Xext/Xxf86vm/XF86VMode.c	Sun Jan 10 09:16:46 2010 +0000
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Sun Jan 10 18:19:35 2010 +0000
@@ -37,12 +37,17 @@
 #define NEED_REPLIES
 
 #ifndef XBUILD_IN_CLIENT
+
+/* 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 "../extensions/xf86vmstr.h"
 #include "../extensions/Xext.h"
 #include "../extensions/extutil.h"
 #else
-#include "lib/X11/Xlibint.h"
 #include "include/extensions/xf86vmstr.h"
 #include "include/extensions/Xext.h"
 #include "include/extensions/extutil.h"
diff -r da2a23b56493 -r 81dde1b00bf1 src/video/x11/SDL_x11dyn.h
--- a/src/video/x11/SDL_x11dyn.h	Sun Jan 10 09:16:46 2010 +0000
+++ b/src/video/x11/SDL_x11dyn.h	Sun Jan 10 18:19:35 2010 +0000
@@ -27,7 +27,13 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+
+/* 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/Xproto.h>
 #include "../Xext/extensions/Xext.h"
 #include "../Xext/extensions/extutil.h"