Mercurial > sdl-ios-xcode
changeset 3633:81dde1b00bf1
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 | da2a23b56493 |
| children | 1e31a24c41a6 |
| files | src/video/Xext/XME/xme.c src/video/Xext/Xinerama/Xinerama.c src/video/Xext/Xv/Xvlibint.h src/video/Xext/Xxf86vm/XF86VMode.c src/video/x11/SDL_x11dyn.h |
| diffstat | 5 files changed, 27 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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 */
--- 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"
--- 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"
--- 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"