Mercurial > sdl-ios-xcode
diff 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 |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11dyn.h Sun Jan 10 09:16:46 2010 +0000 +++ b/src/video/x11/SDL_x11dyn.h Sun Jan 10 18:19:35 2010 +0000 @@ -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"