Mercurial > sdl-ios-xcode

comparison src/video/Xext/Xxf86vm/XF86VMode.c @ 3633:81dde1b00bf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3632:da2a23b56493 3633:81dde1b00bf1
35 35
36 #define NEED_EVENTS 36 #define NEED_EVENTS
37 #define NEED_REPLIES 37 #define NEED_REPLIES
38 38
39 #ifndef XBUILD_IN_CLIENT 39 #ifndef XBUILD_IN_CLIENT
40
41 /* Apparently some X11 systems can't include this multiple times... */
42 #ifndef SDL_INCLUDED_XLIBINT_H
43 #define SDL_INCLUDED_XLIBINT_H 1
40 #include <X11/Xlibint.h> 44 #include <X11/Xlibint.h>
45 #endif
46
41 #include "../extensions/xf86vmstr.h" 47 #include "../extensions/xf86vmstr.h"
42 #include "../extensions/Xext.h" 48 #include "../extensions/Xext.h"
43 #include "../extensions/extutil.h" 49 #include "../extensions/extutil.h"
44 #else 50 #else
45 #include "lib/X11/Xlibint.h"
46 #include "include/extensions/xf86vmstr.h" 51 #include "include/extensions/xf86vmstr.h"
47 #include "include/extensions/Xext.h" 52 #include "include/extensions/Xext.h"
48 #include "include/extensions/extutil.h" 53 #include "include/extensions/extutil.h"
49 #endif 54 #endif
50 55