From 93775412318910f970a94c11b844102ce843d937 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 10 Jan 2010 18:19:35 +0000
Subject: [PATCH] Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h
 include fixes.

---
 src/video/Xext/XME/xme.c           | 5 +++++
 src/video/Xext/Xinerama/Xinerama.c | 5 +++++
 src/video/Xext/Xv/Xvlibint.h       | 5 +++++
 src/video/Xext/Xxf86vm/XF86VMode.c | 7 ++++++-
 src/video/x11/SDL_x11dyn.h         | 6 ++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c
index c0ec95fb0..12a3e1dbe 100644
--- a/src/video/Xext/XME/xme.c
+++ b/src/video/Xext/XME/xme.c
@@ -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 --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c
index 76b8ca977..3d8d66439 100644
--- a/src/video/Xext/Xinerama/Xinerama.c
+++ b/src/video/Xext/Xinerama/Xinerama.c
@@ -28,7 +28,12 @@ Equipment Corporation.
 #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 --git a/src/video/Xext/Xv/Xvlibint.h b/src/video/Xext/Xv/Xvlibint.h
index 61bb66dba..bfe40da11 100644
--- a/src/video/Xext/Xv/Xvlibint.h
+++ b/src/video/Xext/Xv/Xvlibint.h
@@ -43,7 +43,12 @@ SOFTWARE.
 
 #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 --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c
index 8fa2583ae..e4a6e2b44 100644
--- a/src/video/Xext/Xxf86vm/XF86VMode.c
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c
@@ -37,12 +37,17 @@ from Kaleb S. KEITHLEY.
 #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 --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h
index ba0283afb..071205930 100644
--- a/src/video/x11/SDL_x11dyn.h
+++ b/src/video/x11/SDL_x11dyn.h
@@ -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"