* 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 fb217fc..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 **
@@ -86,13 +83,11 @@ anymore, so they can be removed.
 AMPERSAND_FULL_NAME
 BROKEN_DATAGRAM_SOCKETS
 BROKEN_FIONREAD
-BROKEN_GETWD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
 CLASH_DETECTION
 DATA_SEG_BITS
-DATA_START
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
 DIRECTORY_SEP
@@ -119,7 +114,6 @@ HAVE_CFMAKERAW
 HAVE_CFSETSPEED
 HAVE_CLOCK_GETTIME
 HAVE_CLOCK_SETTIME
-HAVE_CLOSEDIR
 HAVE_COFF_H
 HAVE_COM_ERR_H
 HAVE_COPYSIGN
@@ -140,30 +134,23 @@ 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_DIRENT_H
 HAVE_DUP2
 HAVE_ENDGRENT
 HAVE_ENDPWENT
 HAVE_ENVIRON_DECL
 HAVE_EUIDACCESS
-HAVE_FCNTL_H
 HAVE_FORK
-HAVE_FPATHCONF
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
 HAVE_FSEEKO
-HAVE_FSYNC
 HAVE_FUTIMENS
 HAVE_FUTIMES
 HAVE_FUTIMESAT
 HAVE_GAI_STRERROR
 HAVE_GCONF
 HAVE_GETADDRINFO
-HAVE_GETCWD
 HAVE_GETDELIM
 HAVE_GETGRENT
 HAVE_GETHOSTNAME
@@ -180,13 +167,10 @@ HAVE_GETRLIMIT
 HAVE_GETRUSAGE
 HAVE_GETSOCKNAME
 HAVE_GETTIMEOFDAY
-HAVE_GETWD
 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
@@ -209,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
@@ -237,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
@@ -266,7 +237,6 @@ HAVE_MEMSET
 HAVE_MENUS
 HAVE_MKSTEMP
 HAVE_MMAP
-HAVE_MOUSE
 HAVE_MULTILINGUAL_MENU
 HAVE_NANOTIME
 HAVE_NET_IF_DL_H
@@ -298,9 +268,7 @@ HAVE_SENDTO
 HAVE_SEQPACKET
 HAVE_SETITIMER
 HAVE_SETLOCALE
-HAVE_SETPGID
 HAVE_SETRLIMIT
-HAVE_SETSID
 HAVE_SHARED_GAME_DIR
 HAVE_SHUTDOWN
 HAVE_SIGNED_${GLTYPE}
@@ -308,12 +276,10 @@ HAVE_SIGNED_SIG_ATOMIC_T
 HAVE_SIGNED_WCHAR_T
 HAVE_SIGNED_WINT_T
 HAVE_SIGSET_T
-HAVE_SIZE_T
 HAVE_SNPRINTF
 HAVE_SOCKETS
 HAVE_SOUND
 HAVE_SOUNDCARD_H
-HAVE_SPEED_T
 HAVE_STDINT_H
 HAVE_STDIO_EXT_H
 HAVE_STDLIB_H
@@ -373,7 +339,6 @@ HAVE_TM_ZONE
 HAVE_TOUCHLOCK
 HAVE_TZNAME
 HAVE_TZSET
-HAVE_UNISTD_H
 HAVE_UNSIGNED_LONG_LONG_INT
 HAVE_UTIL_H
 HAVE_UTIMENSAT
@@ -393,7 +358,6 @@ HAVE_WS2TCPIP_H
 HAVE_XAW3D
 HAVE_XFT
 HAVE_XIM
-HAVE_XKBGETKEYBOARD
 HAVE_XPM
 HAVE_XRMSETDATABASE
 HAVE_XSCREENNUMBEROFSCREEN
@@ -421,9 +385,6 @@ NO_EDITRES
 NSIG
 NSIG_MINIMUM
 NULL_DEVICE
-ORDINARY_LINK
-O_RDONLY
-O_RDWR
 PAGESIZE
 PREFER_VSUSP
 PTY_ITERATION
@@ -432,16 +393,8 @@ PTY_OPEN
 PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
-SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
-SIGALRM
-SIGCHLD
-SIGHUP
-SIGKILL
 SIGNALS_VIA_CHARACTERS
-SIGPIPE
-SIGQUIT
-SIGTRAP
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_MALLOC
@@ -451,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