Mercurial > sdl-ios-xcode
diff src/video/Xext/Xxf86vm/XF86VMode.c @ 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 | 90de10bc38ec |
children |
line wrap: on
line diff
--- a/src/video/Xext/Xxf86vm/XF86VMode.c Sun Jan 10 09:16:46 2010 +0000 +++ b/src/video/Xext/Xxf86vm/XF86VMode.c Sun Jan 10 18:19:35 2010 +0000 @@ -37,12 +37,17 @@ #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"