Mercurial > sdl-ios-xcode
comparison src/video/x11/SDL_x11dyn.h @ 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 | 99210400e8b9 |
children | f7b03b6838cb |
comparison
equal
deleted
inserted
replaced
3632:da2a23b56493 | 3633:81dde1b00bf1 |
---|---|
25 #define _SDL_x11dyn_h | 25 #define _SDL_x11dyn_h |
26 | 26 |
27 #include <X11/Xlib.h> | 27 #include <X11/Xlib.h> |
28 #include <X11/Xutil.h> | 28 #include <X11/Xutil.h> |
29 #include <X11/Xatom.h> | 29 #include <X11/Xatom.h> |
30 | |
31 /* Apparently some X11 systems can't include this multiple times... */ | |
32 #ifndef SDL_INCLUDED_XLIBINT_H | |
33 #define SDL_INCLUDED_XLIBINT_H 1 | |
30 #include <X11/Xlibint.h> | 34 #include <X11/Xlibint.h> |
35 #endif | |
36 | |
31 #include <X11/Xproto.h> | 37 #include <X11/Xproto.h> |
32 #include "../Xext/extensions/Xext.h" | 38 #include "../Xext/extensions/Xext.h" |
33 #include "../Xext/extensions/extutil.h" | 39 #include "../Xext/extensions/extutil.h" |
34 | 40 |
35 #ifndef NO_SHARED_MEMORY | 41 #ifndef NO_SHARED_MEMORY |