# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1206941241 0
# Node ID 904defc0792e6e4e636234d3a7a8e15aff541499
# Parent  73e7e7f5b5a1b8586a6957eb1a72917d4136b707
Fix X11 build issue with multiple includes of Xlibint.h ...

diff -r 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/XME/xme.c
--- a/src/video/Xext/XME/xme.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/XME/xme.c	Mon Mar 31 05:27:21 2008 +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 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/Xinerama/Xinerama.c
--- a/src/video/Xext/Xinerama/Xinerama.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xinerama/Xinerama.c	Mon Mar 31 05:27:21 2008 +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 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/Xv/Xvlibint.h
--- a/src/video/Xext/Xv/Xvlibint.h	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xv/Xvlibint.h	Mon Mar 31 05:27:21 2008 +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 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/Xxf86dga/XF86DGA.c
--- a/src/video/Xext/Xxf86dga/XF86DGA.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Mon Mar 31 05:27:21 2008 +0000
@@ -59,7 +59,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 "../extensions/xf86dga.h"
 #include "../extensions/xf86dgastr.h"
 #include "../extensions/Xext.h"
diff -r 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/Xxf86dga/XF86DGA2.c
--- a/src/video/Xext/Xxf86dga/XF86DGA2.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xxf86dga/XF86DGA2.c	Mon Mar 31 05:27:21 2008 +0000
@@ -17,7 +17,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 "../extensions/xf86dga.h"
 #include "../extensions/xf86dgastr.h"
 #include "../extensions/Xext.h"
diff -r 73e7e7f5b5a1 -r 904defc0792e src/video/Xext/Xxf86vm/XF86VMode.c
--- a/src/video/Xext/Xxf86vm/XF86VMode.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Mar 31 05:27:21 2008 +0000
@@ -37,12 +37,15 @@
 #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 73e7e7f5b5a1 -r 904defc0792e src/video/dga/SDL_dgavideo.h
--- a/src/video/dga/SDL_dgavideo.h	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/dga/SDL_dgavideo.h	Mon Mar 31 05:27:21 2008 +0000
@@ -25,7 +25,13 @@
 #define _SDL_dgavideo_h
 
 #include <X11/Xlib.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 "SDL_mouse.h"
diff -r 73e7e7f5b5a1 -r 904defc0792e src/video/x11/SDL_x11dyn.h
--- a/src/video/x11/SDL_x11dyn.h	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/x11/SDL_x11dyn.h	Mon Mar 31 05:27:21 2008 +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"