From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 30 Oct 1995 19:41:44 +0000 (+0000)
Subject: Move the include of Xlocale.h after setting HAVE_X11R5.
X-Git-Tag: emacs-19.34~2514
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cfc57cea0c285c99dcb5ac252d5107f8fb0329e4;p=emacs.git

Move the include of Xlocale.h after setting HAVE_X11R5.
---

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.  */
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
 
-#ifdef HAVE_X11R5
-#define HAVE_X_I18N
-#include <X11/Xlocale.h>
-#endif
-
 #ifdef USE_X_TOOLKIT
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>	/* CoreP.h needs this */
@@ -83,6 +78,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define HAVE_X11R4
 #endif
 #endif
+
+#ifdef HAVE_X11R5
+#define HAVE_X_I18N
+#include <X11/Xlocale.h>
+#endif
 
 #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \
 					 XScreenNumberOfScreen (FRAME_X_SCREEN (f)))