From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 1 Nov 2007 07:42:58 +0000 (+0000)
Subject: Remove HAVE_X11R5.
X-Git-Tag: emacs-pretest-23.0.90~9900
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=449e33d766186b74b316b392f08d2827a3eee613;p=emacs.git

Remove HAVE_X11R5.
---

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 7b97e14f590..bcf4d5b5624 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* inc/config.h: Remove HAVE_X11R5.
+
 2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o.
diff --git a/mac/inc/config.h b/mac/inc/config.h
index ae741b0681f..49bc7d6bae2 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -716,9 +716,6 @@ Boston, MA 02110-1301, USA.  */
    expects to use version 10. */
 /* #undef HAVE_X11 */
 
-/* Define to 1 if you have the X11R5 or newer version of Xlib. */
-/* #undef HAVE_X11R5 */
-
 /* Define to 1 if you have the X11R6 or newer version of Xlib. */
 /* #undef HAVE_X11R6 */
 
@@ -1145,7 +1142,7 @@ typedef unsigned size_t;
 
 #ifdef HAVE_X11R6
 #define HAVE_X_I18N
-#elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N
+#elif !defined X11R5_INHIBIT_I18N
 #define HAVE_X_I18N
 #endif