Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h include fixes.
authorRyan C. Gordon
Sun, 10 Jan 2010 18:19:35 +0000
changeset 363381dde1b00bf1
parent 3632 da2a23b56493
child 3634 1e31a24c41a6
Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h include fixes.
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
     1.1 --- a/src/video/Xext/XME/xme.c	Sun Jan 10 09:16:46 2010 +0000
     1.2 +++ b/src/video/Xext/XME/xme.c	Sun Jan 10 18:19:35 2010 +0000
     1.3 @@ -14,7 +14,12 @@
     1.4  #define NEED_EVENTS
     1.5  #define NEED_REPLIES
     1.6  
     1.7 +/* Apparently some X11 systems can't include this multiple times... */
     1.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     1.9 +#define SDL_INCLUDED_XLIBINT_H 1
    1.10  #include <X11/Xlibint.h>
    1.11 +#endif
    1.12 +
    1.13  #include <X11/Xthreads.h>
    1.14  #include <X11/Xmd.h>
    1.15  #include <X11/Xproto.h>
     2.1 --- a/src/video/Xext/Xinerama/Xinerama.c	Sun Jan 10 09:16:46 2010 +0000
     2.2 +++ b/src/video/Xext/Xinerama/Xinerama.c	Sun Jan 10 18:19:35 2010 +0000
     2.3 @@ -28,7 +28,12 @@
     2.4  #define NEED_EVENTS
     2.5  #define NEED_REPLIES
     2.6  
     2.7 +/* Apparently some X11 systems can't include this multiple times... */
     2.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     2.9 +#define SDL_INCLUDED_XLIBINT_H 1
    2.10  #include <X11/Xlibint.h>
    2.11 +#endif
    2.12 +
    2.13  #include <X11/Xutil.h>
    2.14  #include "../extensions/Xext.h"
    2.15  #include "../extensions/extutil.h"      /* in ../include */
     3.1 --- a/src/video/Xext/Xv/Xvlibint.h	Sun Jan 10 09:16:46 2010 +0000
     3.2 +++ b/src/video/Xext/Xv/Xvlibint.h	Sun Jan 10 18:19:35 2010 +0000
     3.3 @@ -43,7 +43,12 @@
     3.4  
     3.5  #define NEED_REPLIES
     3.6  
     3.7 +/* Apparently some X11 systems can't include this multiple times... */
     3.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     3.9 +#define SDL_INCLUDED_XLIBINT_H 1
    3.10  #include <X11/Xlibint.h>
    3.11 +#endif
    3.12 +
    3.13  #include "../extensions/Xvproto.h"
    3.14  #include "../extensions/Xvlib.h"
    3.15  
     4.1 --- a/src/video/Xext/Xxf86vm/XF86VMode.c	Sun Jan 10 09:16:46 2010 +0000
     4.2 +++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Sun Jan 10 18:19:35 2010 +0000
     4.3 @@ -37,12 +37,17 @@
     4.4  #define NEED_REPLIES
     4.5  
     4.6  #ifndef XBUILD_IN_CLIENT
     4.7 +
     4.8 +/* Apparently some X11 systems can't include this multiple times... */
     4.9 +#ifndef SDL_INCLUDED_XLIBINT_H
    4.10 +#define SDL_INCLUDED_XLIBINT_H 1
    4.11  #include <X11/Xlibint.h>
    4.12 +#endif
    4.13 +
    4.14  #include "../extensions/xf86vmstr.h"
    4.15  #include "../extensions/Xext.h"
    4.16  #include "../extensions/extutil.h"
    4.17  #else
    4.18 -#include "lib/X11/Xlibint.h"
    4.19  #include "include/extensions/xf86vmstr.h"
    4.20  #include "include/extensions/Xext.h"
    4.21  #include "include/extensions/extutil.h"
     5.1 --- a/src/video/x11/SDL_x11dyn.h	Sun Jan 10 09:16:46 2010 +0000
     5.2 +++ b/src/video/x11/SDL_x11dyn.h	Sun Jan 10 18:19:35 2010 +0000
     5.3 @@ -27,7 +27,13 @@
     5.4  #include <X11/Xlib.h>
     5.5  #include <X11/Xutil.h>
     5.6  #include <X11/Xatom.h>
     5.7 +
     5.8 +/* Apparently some X11 systems can't include this multiple times... */
     5.9 +#ifndef SDL_INCLUDED_XLIBINT_H
    5.10 +#define SDL_INCLUDED_XLIBINT_H 1
    5.11  #include <X11/Xlibint.h>
    5.12 +#endif
    5.13 +
    5.14  #include <X11/Xproto.h>
    5.15  #include "../Xext/extensions/Xext.h"
    5.16  #include "../Xext/extensions/extutil.h"