aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-02-28 18:07:46 +0000
committerRichard M. Stallman1996-02-28 18:07:46 +0000
commit5b681bb56645917bd08610bc80cce65a3ea40628 (patch)
treec8b2745bee76b2008449f43433972e47ddde195a /src
parent9291c07243d4305c1a3b165fab762554c6a6b258 (diff)
downloademacs-5b681bb56645917bd08610bc80cce65a3ea40628.tar.gz
emacs-5b681bb56645917bd08610bc80cce65a3ea40628.zip
[AIX] [HAVE_X11R5] (XIMStatusNothing): Defined.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c
index bade5b56765..5eb1942998f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -104,6 +104,15 @@ extern void free_frame_menubar ();
104#define MAXREQUEST(dpy) ((dpy)->max_request_size) 104#define MAXREQUEST(dpy) ((dpy)->max_request_size)
105#endif 105#endif
106 106
107#ifdef AIX
108#ifdef HAVE_X11R5
109/* AIX uses an incompatible name for this, at least in X11R5.
110 I'm guessing that in X11R6 it will be compatible. */
111#undef XIMStatusNothing
112#define XIMStatusNothing XIMStatusNone
113#endif
114#endif
115
107/* The name we're using in resource queries. */ 116/* The name we're using in resource queries. */
108Lisp_Object Vx_resource_name; 117Lisp_Object Vx_resource_name;
109 118