# HG changeset patch
# User stephent
# Date 1105956618 0
# Node ID bc9d41cf82df6abb83da2411b2593e826ac9c7b4
# Parent  57a5686cfe9c645cb654ab060a3c6b9b3b7ce0b0
[xemacs-hg @ 2005-01-17 10:10:16 by stephent]
Ville's ISO LEVEL 3 SHIFT patch <878y6sjrm7.fsf@tleepslib.sk.tsukuba.ac.jp>

diff -r 57a5686cfe9c -r bc9d41cf82df src/ChangeLog
--- a/src/ChangeLog	Sun Jan 16 22:51:27 2005 +0000
+++ b/src/ChangeLog	Mon Jan 17 10:10:18 2005 +0000
@@ -1,3 +1,7 @@
+2005-01-12  Ville Skyttä  <scop@xemacs.org>
+
+	* console-x.h: #include X11/keysym.h before xintrinsic.h.
+
 2005-01-06  Zajcev Evgeny <zevlg@yandex.ru>
 
 	* scrollbar.c (compute_scrollbar_instance_usage):
diff -r 57a5686cfe9c -r bc9d41cf82df src/console-x.h
--- a/src/console-x.h	Sun Jan 16 22:51:27 2005 +0000
+++ b/src/console-x.h	Mon Jan 17 10:10:18 2005 +0000
@@ -36,11 +36,14 @@
 #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 "../lwlib/lwlib.h"
 
 #include <X11/cursorfont.h>
-#include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/StringDefs.h>