Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org

[bpt/emacs.git] / admin / CPP-DEFINES

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index a89d176..8bfe2ca 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -24,7 +24,6 @@ _MSC_VER      Compiling the W32 port with the Microsoft C compiler.
 DARWIN_OS      Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
-USG5
 USG5_4
 
 ** Distinguishing GUIs **
@@ -87,7 +86,6 @@ BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
-CLASH_DETECTION
 DATA_SEG_BITS
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
@@ -135,8 +133,6 @@ HAVE_DECL_STRTOUMAX
 HAVE_DECL_SYS_SIGLIST
 HAVE_DECL_TZNAME
 HAVE_DECL___SYS_SIGLIST
-HAVE_DES_H
-HAVE_DEV_PTMX
 HAVE_DIALOGS
 HAVE_DIFFTIME
 HAVE_DUP2
@@ -174,8 +170,6 @@ HAVE_GET_CURRENT_DIR_NAME
 HAVE_GHOSTSCRIPT
 HAVE_GIF
 HAVE_GNUTLS
-HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY
-HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION
 HAVE_GPM
 HAVE_GRANTPT
 HAVE_GSETTINGS
@@ -198,26 +192,15 @@ HAVE_IMAGEMAGICK
 HAVE_INET_SOCKETS
 HAVE_INTTYPES_H
 HAVE_JPEG
-HAVE_KERBEROSIV_DES_H
 HAVE_KERBEROSIV_KRB_H
-HAVE_KERBEROS_DES_H
 HAVE_KERBEROS_KRB_H
 HAVE_KRB5_ERROR_E_TEXT
 HAVE_KRB5_ERROR_TEXT
 HAVE_KRB5_H
 HAVE_KRB_H
 HAVE_LANGINFO_CODESET
-HAVE_LIBCOM_ERR
-HAVE_LIBCRYPTO
-HAVE_LIBDES
-HAVE_LIBDES425
 HAVE_LIBDGC
 HAVE_LIBDNET
-HAVE_LIBHESIOD
-HAVE_LIBK5CRYPTO
-HAVE_LIBKRB
-HAVE_LIBKRB4
-HAVE_LIBKRB5
 HAVE_LIBKSTAT
 HAVE_LIBLOCKFILE
 HAVE_LIBM
@@ -226,12 +209,10 @@ HAVE_LIBOTF
 HAVE_LIBPERFSTAT
 HAVE_LIBPNG_PNG_H
 HAVE_LIBPTHREADS
-HAVE_LIBRESOLV
 HAVE_LIBSELINUX
 HAVE_LIBXEXT
 HAVE_LIBXML2
 HAVE_LIBXMU
-HAVE_LINUX_VERSION_H
 HAVE_LOCALTIME_R
 HAVE_LOCAL_SOCKETS
 HAVE_LONG_FILE_NAMES
@@ -298,7 +279,6 @@ HAVE_SNPRINTF
 HAVE_SOCKETS
 HAVE_SOUND
 HAVE_SOUNDCARD_H
-HAVE_SPEED_T
 HAVE_STDINT_H
 HAVE_STDIO_EXT_H
 HAVE_STDLIB_H