Change do-not-merge pattern to "do not merge"

[gnu-emacs] / admin / CPP-DEFINES

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 86f2fa5a4143157950e9d81144748785447b2d9b..d9df152bff5a8c916823d2a9400d84b7460c305e 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -13,7 +13,6 @@ CYGWIN                Compiling the Cygwin port.
 __CYGWIN__     Ditto
 GNU_LINUX
 HPUX
-IRIX6_5
 MSDOS          Compiling the MS-DOS port.
 __MSDOS__      Ditto.
 __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c.
@@ -148,7 +147,6 @@ HAVE_FUTIMES
 HAVE_FUTIMESAT
 HAVE_GAI_STRERROR
 HAVE_GCONF
-HAVE_GETADDRINFO
 HAVE_GETDELIM
 HAVE_GETGRENT
 HAVE_GETHOSTNAME
@@ -185,7 +183,6 @@ HAVE_GTK_WIDGET_GET_WINDOW
 HAVE_GTK_WIDGET_SET_HAS_WINDOW
 HAVE_GTK_WINDOW_SET_HAS_RESIZE_GRIP
 HAVE_G_TYPE_INIT
-HAVE_H_ERRNO
 HAVE_IFADDRS_H
 HAVE_IMAGEMAGICK
 HAVE_INET_SOCKETS
@@ -378,7 +375,6 @@ NSIG
 NSIG_MINIMUM
 NULL_DEVICE
 PAGESIZE
-PREFER_VSUSP
 PTY_ITERATION
 PTY_NAME_SPRINTF
 PTY_OPEN