merge trunk

1 files changed, 3 insertions, 9 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index d4776c9b755..1f42eeb9528 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -22,7 +22,6 @@ NS_IMPL_GNUSTEP	Compile support for GNUstep implementation of NS GUI API.
 NS_IMPL_COCOA   Compile support for Cocoa (Apple) implementation of NS GUI API.
 HAVE_X11        Compile support for the X11 GUI.
 HAVE_X_WINDOWS  Compile support for X Window system
-X11             ??  Makefile.in suggests it's equivalent to HAVE_X11
 USE_LUCID       Use the Lucid toolkit for menus&scrollbars.  Requires HAVE_X11.
 USE_MOTIF       Use the Motif toolkit for menus&scrollbars.  Requires HAVE_X11.
 USE_GTK         Use the Gtk   toolkit for menus&scrollbars.  Requires HAVE_X11.
@@ -84,6 +83,9 @@ BCOPY_DOWNWARD_SAFE
 BCOPY_UPWARD_SAFE
 BITS_PER_EMACS_INT
 BITS_PER_LONG
+BITS_PER_CHAR
+BITS_PER_SHORT
+BITS_PER_INT
 BROKEN_DATAGRAM_SOCKETS
 BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
@@ -98,7 +100,6 @@ BSD4_2
 BSD4_3
 BSD_SYSTEM
 CLASH_DETECTION
-C_SWITCH_X_SYSTEM
 DATA_SEG_BITS
 DATA_START
 DBL_MIN_REPLACEMENT
@@ -114,7 +115,6 @@ EMACS_CONFIGURATION
 EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
-END_FILES_1
 FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
 FSCALE
@@ -133,7 +133,6 @@ HAVE_BCMP
 HAVE_BCOPY
 HAVE_CBRT
 HAVE_CLOSEDIR
-HAVE_CRTIN
 HAVE_DUP2
 HAVE_EUIDACCESS
 HAVE_FMOD
@@ -154,9 +153,6 @@ HAVE_INDEX
 HAVE_INET_SOCKETS
 HAVE_INVERSE_HYPERBOLIC
 HAVE_LIBKSTAT
-HAVE_LIBNCURSES
-HAVE_LIBPTHREADS
-HAVE_LIBXMU
 HAVE_LIMITS_H
 HAVE_LINUX_VERSION_H
 HAVE_LOGB
@@ -266,8 +262,6 @@ SIGQUIT
 SIGTRAP
 SIGTYPE
 SOLARIS2
-START_FILES
-START_FILES_1
 STDC_HEADERS
 SYMS_SYSTEM
 SYSTEM_PURESIZE_EXTRA