aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2007-11-01 07:42:58 +0000
committerJan Djärv2007-11-01 07:42:58 +0000
commit449e33d766186b74b316b392f08d2827a3eee613 (patch)
treeed7d2aab02ac734f4c6fd3fb1408cb6f11e4fb61
parentac1278c1f0467600aae57ee5e33e4ca09b742585 (diff)
downloademacs-449e33d766186b74b316b392f08d2827a3eee613.tar.gz
emacs-449e33d766186b74b316b392f08d2827a3eee613.zip
Remove HAVE_X11R5.
-rw-r--r--mac/ChangeLog4
-rw-r--r--mac/inc/config.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 7b97e14f590..bcf4d5b5624 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
12007-11-01 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * inc/config.h: Remove HAVE_X11R5.
4
12007-11-01 Dan Nicolaescu <dann@ics.uci.edu> 52007-11-01 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o. 7 * 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. */
716 expects to use version 10. */ 716 expects to use version 10. */
717/* #undef HAVE_X11 */ 717/* #undef HAVE_X11 */
718 718
719/* Define to 1 if you have the X11R5 or newer version of Xlib. */
720/* #undef HAVE_X11R5 */
721
722/* Define to 1 if you have the X11R6 or newer version of Xlib. */ 719/* Define to 1 if you have the X11R6 or newer version of Xlib. */
723/* #undef HAVE_X11R6 */ 720/* #undef HAVE_X11R6 */
724 721
@@ -1145,7 +1142,7 @@ typedef unsigned size_t;
1145 1142
1146#ifdef HAVE_X11R6 1143#ifdef HAVE_X11R6
1147#define HAVE_X_I18N 1144#define HAVE_X_I18N
1148#elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N 1145#elif !defined X11R5_INHIBIT_I18N
1149#define HAVE_X_I18N 1146#define HAVE_X_I18N
1150#endif 1147#endif
1151 1148