From 56e48a19528d83b851868e941da7dd389f84a045 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 31 Mar 2008 05:27:21 +0000 Subject: [PATCH] Fix X11 build issue with multiple includes of Xlibint.h ... --- src/video/Xext/XME/xme.c | 5 +++++ src/video/Xext/Xinerama/Xinerama.c | 5 +++++ src/video/Xext/Xv/Xvlibint.h | 5 +++++ src/video/Xext/Xxf86dga/XF86DGA.c | 5 +++++ src/video/Xext/Xxf86dga/XF86DGA2.c | 5 +++++ src/video/Xext/Xxf86vm/XF86VMode.c | 5 ++++- src/video/dga/SDL_dgavideo.h | 6 ++++++ src/video/x11/SDL_x11dyn.h | 6 ++++++ 8 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/video/Xext/XME/xme.c b/src/video/Xext/XME/xme.c index a3674d53d..2cead35ad 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 +#endif + #include #include #include diff --git a/src/video/Xext/Xinerama/Xinerama.c b/src/video/Xext/Xinerama/Xinerama.c index 049be45c2..4ff42ebfe 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 +#endif + #include #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 d0bb70836..20df706dc 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 +#endif + #include "../extensions/Xvproto.h" #include "../extensions/Xvlib.h" diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c index 346e9e7ed..fc729f125 100644 --- a/src/video/Xext/Xxf86dga/XF86DGA.c +++ b/src/video/Xext/Xxf86dga/XF86DGA.c @@ -59,7 +59,12 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #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 +#endif + #include "../extensions/xf86dga.h" #include "../extensions/xf86dgastr.h" #include "../extensions/Xext.h" diff --git a/src/video/Xext/Xxf86dga/XF86DGA2.c b/src/video/Xext/Xxf86dga/XF86DGA2.c index 3acf9f8e7..fffd180db 100644 --- a/src/video/Xext/Xxf86dga/XF86DGA2.c +++ b/src/video/Xext/Xxf86dga/XF86DGA2.c @@ -17,7 +17,12 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc #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 +#endif + #include "../extensions/xf86dga.h" #include "../extensions/xf86dgastr.h" #include "../extensions/Xext.h" diff --git a/src/video/Xext/Xxf86vm/XF86VMode.c b/src/video/Xext/Xxf86vm/XF86VMode.c index 7901991fb..5cb21905a 100644 --- a/src/video/Xext/Xxf86vm/XF86VMode.c +++ b/src/video/Xext/Xxf86vm/XF86VMode.c @@ -37,12 +37,15 @@ 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 +#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/dga/SDL_dgavideo.h b/src/video/dga/SDL_dgavideo.h index 9af6f6ba1..21a77d7bc 100644 --- a/src/video/dga/SDL_dgavideo.h +++ b/src/video/dga/SDL_dgavideo.h @@ -25,7 +25,13 @@ #define _SDL_dgavideo_h #include + +/* Apparently some X11 systems can't include this multiple times... */ +#ifndef SDL_INCLUDED_XLIBINT_H +#define SDL_INCLUDED_XLIBINT_H 1 #include +#endif + #include #include "SDL_mouse.h" diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h index 2e7e6ceaa..8c45ffdc2 100644 --- a/src/video/x11/SDL_x11dyn.h +++ b/src/video/x11/SDL_x11dyn.h @@ -27,7 +27,13 @@ #include #include #include + +/* Apparently some X11 systems can't include this multiple times... */ +#ifndef SDL_INCLUDED_XLIBINT_H +#define SDL_INCLUDED_XLIBINT_H 1 #include +#endif + #include #include "../Xext/extensions/Xext.h"