pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix X11 build issue with multiple includes of Xlibint.h ...

Browse source 
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402749
This commit is contained in:
Ryan C. Gordon 2008-03-31 05:27:21 +00:00
parent 5627b3d45a
commit 78de16e629
8 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/video/Xext/XME/xme.c
View file

@ -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>

5
src/video/Xext/Xinerama/Xinerama.c
View file

@ -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 */

5
src/video/Xext/Xv/Xvlibint.h
View file

@ -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"

5
src/video/Xext/Xxf86dga/XF86DGA.c
View file

@ -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 <X11/Xlibint.h>
#endif
#include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h"
#include "../extensions/Xext.h"

5
src/video/Xext/Xxf86dga/XF86DGA2.c
View file

@ -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 <X11/Xlibint.h>
#endif
#include "../extensions/xf86dga.h"
#include "../extensions/xf86dgastr.h"
#include "../extensions/Xext.h"

5
src/video/Xext/Xxf86vm/XF86VMode.c
View file

@ -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 <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"

6
src/video/dga/SDL_dgavideo.h
View file

@ -25,7 +25,13 @@
#define _SDL_dgavideo_h
#include <X11/Xlib.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 "SDL_mouse.h"

6
src/video/x11/SDL_x11dyn.h
View file

@ -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"