X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-x.h;h=1850c216bff3440f4e94de5b0b96b1fb272ebae5;hb=f8ae56b3326d330d95c0b97e9c881eb53bd18a19;hp=d664360c21256c95f2563014b7284c76e076c6d0;hpb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18;p=chise%2Fxemacs-chise.git.1

diff --git a/src/console-x.h b/src/console-x.h
index d664360..1850c21 100644
--- a/src/console-x.h
+++ b/src/console-x.h
@@ -35,10 +35,13 @@ Boston, MA 02111-1307, USA.  */
 #ifdef HAVE_X_WINDOWS
 
 #include "console.h"
+/* must come before Xutil.h, which is included indirectly from xintrinsic.h,
+   to avoid breakage in keysym-parsing macros from X11R6, at least X.org as
+   of 2005-01-17, and probably XFree86 too from reports on c.e.x */
+#include <X11/keysym.h>
 #include "xintrinsic.h"
 
 #include <X11/cursorfont.h>
-#include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>