Mercurial > emacs

comparison src/xterm.h @ 13346:620c6dc0329c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the include of Xlocale.h after setting HAVE_X11R5.
author Richard M. Stallman <rms@gnu.org>
date Mon, 30 Oct 1995 19:41:44 +0000
parents 2edc6ae38a78
children 72e8212db4d9
comparison
equal deleted inserted replaced
13345:d2fd514cc0aa 13346:620c6dc0329c
21 #include <X11/cursorfont.h> 21 #include <X11/cursorfont.h>
22 #include <X11/Xutil.h> 22 #include <X11/Xutil.h>
23 #include <X11/keysym.h> 23 #include <X11/keysym.h>
24 #include <X11/Xatom.h> 24 #include <X11/Xatom.h>
25 #include <X11/Xresource.h> 25 #include <X11/Xresource.h>
26
27 #ifdef HAVE_X11R5
28 #define HAVE_X_I18N
29 #include <X11/Xlocale.h>
30 #endif
31 26
32 #ifdef USE_X_TOOLKIT 27 #ifdef USE_X_TOOLKIT
33 #include <X11/StringDefs.h> 28 #include <X11/StringDefs.h>
34 #include <X11/IntrinsicP.h> /* CoreP.h needs this */ 29 #include <X11/IntrinsicP.h> /* CoreP.h needs this */
35 #include <X11/CoreP.h> /* foul, but we need this to use our own 30 #include <X11/CoreP.h> /* foul, but we need this to use our own
80 #define HAVE_X11R5 75 #define HAVE_X11R5
81 /* In case someone has X11R5 on AIX 3.1, 76 /* In case someone has X11R5 on AIX 3.1,
82 make sure HAVE_X11R4 is defined as well as HAVE_X11R5. */ 77 make sure HAVE_X11R4 is defined as well as HAVE_X11R5. */
83 #define HAVE_X11R4 78 #define HAVE_X11R4
84 #endif 79 #endif
80 #endif
81
82 #ifdef HAVE_X11R5
83 #define HAVE_X_I18N
84 #include <X11/Xlocale.h>
85 #endif 85 #endif
86 86
87 #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \ 87 #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \
88 XScreenNumberOfScreen (FRAME_X_SCREEN (f))) 88 XScreenNumberOfScreen (FRAME_X_SCREEN (f)))
89 #define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \ 89 #define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \