Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Merged r3576:3577 from branches/SDL-1.2: X11 Xlibint.h include fixes.
  • Loading branch information
icculus committed Jan 10, 2010
1 parent 8e6812e commit 93775412318910f970a94c11b844102ce843d937
@@ -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>
@@ -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 */
@@ -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"

@@ -37,12 +37,17 @@ 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"
@@ -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"

0 comments on commit 9377541

Please sign in to comment.