projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
console-x.h
diff --git
a/src/console-x.h
b/src/console-x.h
index
d664360
..
1850c21
100644
(file)
--- 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"
#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 "xintrinsic.h"
#include <X11/cursorfont.h>
-#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>