* notes/bzr: Update instructions for merging from gnulib.

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

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index f4105f0..27d87dc 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -9,8 +9,6 @@ documented in config.in, and this file would not be necessary.
 
 AIX
 _AIX
-BSD4_2
-BSD_SYSTEM
 CYGWIN         Compiling the Cygwin port.
 __CYGWIN__     Ditto
 GNU_LINUX
@@ -26,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 **
@@ -91,7 +88,6 @@ BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
 CLASH_DETECTION
 DATA_SEG_BITS
-DATA_START
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
 DIRECTORY_SEP
@@ -138,8 +134,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
@@ -151,7 +145,6 @@ HAVE_FORK
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO
-HAVE_FSYNC
 HAVE_FUTIMENS
 HAVE_FUTIMES
 HAVE_FUTIMESAT
@@ -178,8 +171,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
@@ -202,26 +193,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
@@ -230,12 +210,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
@@ -259,7 +237,6 @@ HAVE_MEMSET
 HAVE_MENUS
 HAVE_MKSTEMP
 HAVE_MMAP
-HAVE_MOUSE
 HAVE_MULTILINGUAL_MENU
 HAVE_NANOTIME
 HAVE_NET_IF_DL_H
@@ -303,7 +280,6 @@ HAVE_SNPRINTF
 HAVE_SOCKETS
 HAVE_SOUND
 HAVE_SOUNDCARD_H
-HAVE_SPEED_T
 HAVE_STDINT_H
 HAVE_STDIO_EXT_H
 HAVE_STDLIB_H
@@ -382,7 +358,6 @@ HAVE_WS2TCPIP_H
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
@@ -410,7 +385,6 @@ NO_EDITRES
 NSIG
 NSIG_MINIMUM
 NULL_DEVICE
-ORDINARY_LINK
 PAGESIZE
 PREFER_VSUSP
 PTY_ITERATION
@@ -420,14 +394,7 @@ PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
 SETUP_SLAVE_PTY
-SIGALRM
-SIGCHLD
-SIGHUP
-SIGKILL
 SIGNALS_VIA_CHARACTERS
-SIGPIPE
-SIGQUIT
-SIGTRAP
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_MALLOC
@@ -437,7 +404,6 @@ TERM
 TIME_WITH_SYS_TIME
 TIOCSIGSEND
 TM_IN_SYS_TIME
-ULIMIT_BREAK_VALUE
 UNIX98_PTYS
 USE_TOOLKIT_SCROLL_BARS
 USG_SUBTTY_WORKS