diff options
| author | Richard M. Stallman | 1995-10-30 19:41:44 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-10-30 19:41:44 +0000 |
| commit | cfc57cea0c285c99dcb5ac252d5107f8fb0329e4 (patch) | |
| tree | f6ac8395e801aa7d0e98910d336290a0c47dd31a /src | |
| parent | 0d0e34df0d4161ab0bd45e503fd4b0816570725e (diff) | |
| download | emacs-cfc57cea0c285c99dcb5ac252d5107f8fb0329e4.tar.gz emacs-cfc57cea0c285c99dcb5ac252d5107f8fb0329e4.zip | |
Move the include of Xlocale.h after setting HAVE_X11R5.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xterm.h b/src/xterm.h index d4a9dd90279..7a1e7671ba5 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -24,11 +24,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 24 | #include <X11/Xatom.h> | 24 | #include <X11/Xatom.h> |
| 25 | #include <X11/Xresource.h> | 25 | #include <X11/Xresource.h> |
| 26 | 26 | ||
| 27 | #ifdef HAVE_X11R5 | ||
| 28 | #define HAVE_X_I18N | ||
| 29 | #include <X11/Xlocale.h> | ||
| 30 | #endif | ||
| 31 | |||
| 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 */ |
| @@ -83,6 +78,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 83 | #define HAVE_X11R4 | 78 | #define HAVE_X11R4 |
| 84 | #endif | 79 | #endif |
| 85 | #endif | 80 | #endif |
| 81 | |||
| 82 | #ifdef HAVE_X11R5 | ||
| 83 | #define HAVE_X_I18N | ||
| 84 | #include <X11/Xlocale.h> | ||
| 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))) |