diff src/video/Xext/Xxf86vm/XF86VMode.c @ 4144:904defc0792e SDL-1.2

Fix X11 build issue with multiple includes of Xlibint.h ...
author Ryan C. Gordon <icculus@icculus.org>
date Mon, 31 Mar 2008 05:27:21 +0000
parents ecba4bbaf9c2
children cab9823cb55e
line wrap: on
line diff
--- a/src/video/Xext/Xxf86vm/XF86VMode.c	Wed Mar 12 22:01:48 2008 +0000
+++ b/src/video/Xext/Xxf86vm/XF86VMode.c	Mon Mar 31 05:27:21 2008 +0000
@@ -37,12 +37,15 @@
 #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"