Fix X11 build issue with multiple includes of Xlibint.h ... SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Mon, 31 Mar 2008 05:27:21 +0000
branchSDL-1.2
changeset 4144904defc0792e
parent 4143 73e7e7f5b5a1
child 4145 f00b6b19d57e
Fix X11 build issue with multiple includes of Xlibint.h ...
src/video/Xext/XME/xme.c
src/video/Xext/Xinerama/Xinerama.c
src/video/Xext/Xv/Xvlibint.h
src/video/Xext/Xxf86dga/XF86DGA.c
src/video/Xext/Xxf86dga/XF86DGA2.c
src/video/Xext/Xxf86vm/XF86VMode.c
src/video/dga/SDL_dgavideo.h
src/video/x11/SDL_x11dyn.h
     1.1 --- a/src/video/Xext/XME/xme.c	Wed Mar 12 22:01:48 2008 +0000
     1.2 +++ b/src/video/Xext/XME/xme.c	Mon Mar 31 05:27:21 2008 +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	Wed Mar 12 22:01:48 2008 +0000
     2.2 +++ b/src/video/Xext/Xinerama/Xinerama.c	Mon Mar 31 05:27:21 2008 +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	Wed Mar 12 22:01:48 2008 +0000
     3.2 +++ b/src/video/Xext/Xv/Xvlibint.h	Mon Mar 31 05:27:21 2008 +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/Xxf86dga/XF86DGA.c	Wed Mar 12 22:01:48 2008 +0000
     4.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA.c	Mon Mar 31 05:27:21 2008 +0000
     4.3 @@ -59,7 +59,12 @@
     4.4  #define NEED_EVENTS
     4.5  #define NEED_REPLIES
     4.6  
     4.7 +/* Apparently some X11 systems can't include this multiple times... */
     4.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     4.9 +#define SDL_INCLUDED_XLIBINT_H 1
    4.10  #include <X11/Xlibint.h>
    4.11 +#endif
    4.12 +
    4.13  #include "../extensions/xf86dga.h"
    4.14  #include "../extensions/xf86dgastr.h"
    4.15  #include "../extensions/Xext.h"
     5.1 --- a/src/video/Xext/Xxf86dga/XF86DGA2.c	Wed Mar 12 22:01:48 2008 +0000
     5.2 +++ b/src/video/Xext/Xxf86dga/XF86DGA2.c	Mon Mar 31 05:27:21 2008 +0000
     5.3 @@ -17,7 +17,12 @@
     5.4  #define NEED_EVENTS
     5.5  #define NEED_REPLIES
     5.6  
     5.7 +/* Apparently some X11 systems can't include this multiple times... */
     5.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     5.9 +#define SDL_INCLUDED_XLIBINT_H 1
    5.10  #include <X11/Xlibint.h>
    5.11 +#endif
    5.12 +
    5.13  #include "../extensions/xf86dga.h"
    5.14  #include "../extensions/xf86dgastr.h"
    5.15  #include "../extensions/Xext.h"
     6.1 --- a/src/video/Xext/Xxf86vm/XF86VMode.c	Wed Mar 12 22:01:48 2008 +0000
     6.2 +++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Mar 31 05:27:21 2008 +0000
     6.3 @@ -37,12 +37,15 @@
     6.4  #define NEED_REPLIES
     6.5  
     6.6  #ifndef XBUILD_IN_CLIENT
     6.7 +/* Apparently some X11 systems can't include this multiple times... */
     6.8 +#ifndef SDL_INCLUDED_XLIBINT_H
     6.9 +#define SDL_INCLUDED_XLIBINT_H 1
    6.10  #include <X11/Xlibint.h>
    6.11 +#endif
    6.12  #include "../extensions/xf86vmstr.h"
    6.13  #include "../extensions/Xext.h"
    6.14  #include "../extensions/extutil.h"
    6.15  #else
    6.16 -#include "lib/X11/Xlibint.h"
    6.17  #include "include/extensions/xf86vmstr.h"
    6.18  #include "include/extensions/Xext.h"
    6.19  #include "include/extensions/extutil.h"
     7.1 --- a/src/video/dga/SDL_dgavideo.h	Wed Mar 12 22:01:48 2008 +0000
     7.2 +++ b/src/video/dga/SDL_dgavideo.h	Mon Mar 31 05:27:21 2008 +0000
     7.3 @@ -25,7 +25,13 @@
     7.4  #define _SDL_dgavideo_h
     7.5  
     7.6  #include <X11/Xlib.h>
     7.7 +
     7.8 +/* Apparently some X11 systems can't include this multiple times... */
     7.9 +#ifndef SDL_INCLUDED_XLIBINT_H
    7.10 +#define SDL_INCLUDED_XLIBINT_H 1
    7.11  #include <X11/Xlibint.h>
    7.12 +#endif
    7.13 +
    7.14  #include <X11/Xproto.h>
    7.15  
    7.16  #include "SDL_mouse.h"
     8.1 --- a/src/video/x11/SDL_x11dyn.h	Wed Mar 12 22:01:48 2008 +0000
     8.2 +++ b/src/video/x11/SDL_x11dyn.h	Mon Mar 31 05:27:21 2008 +0000
     8.3 @@ -27,7 +27,13 @@
     8.4  #include <X11/Xlib.h>
     8.5  #include <X11/Xutil.h>
     8.6  #include <X11/Xatom.h>
     8.7 +
     8.8 +/* Apparently some X11 systems can't include this multiple times... */
     8.9 +#ifndef SDL_INCLUDED_XLIBINT_H
    8.10 +#define SDL_INCLUDED_XLIBINT_H 1
    8.11  #include <X11/Xlibint.h>
    8.12 +#endif
    8.13 +
    8.14  #include <X11/Xproto.h>
    8.15  
    8.16  #include "../Xext/extensions/Xext.h"