*** empty log message ***

1 files changed, 3 insertions, 8 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 7952f6a5cfb..cb60bd5f2cc 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -16,7 +16,6 @@ DOS_NT		Compiling for either the MS-DOS or native MS-Windows port.
 WINDOWSNT       Compiling the native MS-Windows (W32) port.
 __MINGW32__     Compiling the W32 port with the MinGW port of GCC.
 _MSC_VER        Compiling the W32 port with the Microsoft C compiler.
-IRIX6_5         Compiling on Irix-6.5
 USE_LISP_UNION_TYPE Define it in lisp.h to make Lisp_Object be a union type instead of the default int.
 
 ** Distinguishing GUIs **
@@ -46,6 +45,7 @@ FRAME_WINDOW_P	A GUI frame (like X, w32, etc.)
 ** Compile-time options **
 REL_ALLOC       Compile in the relocatable memory allocator ralloc.c.
 SYSTEM_MALLOC   Use the system library's malloc.
+subprocesses    System can use subprocesses (for M-x shell for example).  Defined by default, only MSDOS undefines it.
 
 ** Replace, the definition is trivial: SWITCH_ENUM_CAST
 
@@ -86,7 +86,6 @@ C_SWITCH_MACHINE
 C_SWITCH_SYSTEM
 C_SWITCH_SYSTEM_TEMACS
 C_SWITCH_X_SYSTEM
-DATA_END
 DATA_SEG_BITS
 DATA_START
 DBL_MIN_REPLACEMENT
@@ -209,17 +208,13 @@ IBMR2AIX
 INHIBIT_X11R6_XIM
 INTERNAL_TERMINAL
 INTERRUPT_INPUT
-IRIS
-IRIS_4D
 IS_ANY_SEP
 IS_DIRECTORY_SEP
 KERNEL_FILE
 LDAV_SYMBOL
 LD_SWITCH_MACHINE
 LD_SWITCH_MACHINE_TEMACS
-LD_SWITCH_SITE
 LD_SWITCH_SYSTEM
-LD_SWITCH_SYSTEM_1
 LD_SWITCH_SYSTEM_TEMACS
 LD_SWITCH_SYSTEM_tmp
 LD_SWITCH_X_DEFAULT
@@ -236,7 +231,6 @@ LIB_MOTIF
 LIB_STANDARD
 LINKER
 LINK_CRTL_SHARE
-LINUX_SBRK_BUG
 LINUX_VERSION_CODE
 LISP_FLOAT_TYPE
 LNOFLSH
@@ -322,6 +316,7 @@ STDC_HEADERS
 SYMS_SYSTEM
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_TYPE
+SYSTEM_MALLOC
 SYSV_SYSTEM_DIR
 Srandom
 TAB3
@@ -370,6 +365,7 @@ __ELF__
 __FreeBSD__
 __FreeBSD_version
 __GNUC__
+__GNU_LIBRARY__
 __GNUC_MINOR__
 __NetBSD__
 __OpenBSD__
@@ -456,7 +452,6 @@ strerror
 stricmp
 strnicmp
 strupr
-subprocesses
 sys_nerr
 system
 temacs