Merge from trunk.

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

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index b5f4d55..6e0f736 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -53,18 +53,12 @@ CLASH_DETECTION
 COFF
 FIRST_PTY_LETTER
 HAVE_PTYS
-HAVE_TERMIO
-HAVE_TERMIOS
 INTERRUPT_INPUT
 NARROWPROTO
 SEPCHAR
-SIGTYPE
 SYSTEM_TYPE
 
 ** Machine specific macros, decribed in detail in src/m/template.h
-EXPLICIT_SIGN_EXTEND
-LOAD_AVE_CVT
-LOAD_AVE_TYPE
 VIRT_ADDR_VARIES
 
 ** Misc macros
@@ -112,7 +106,6 @@ EMACS_INT
 EMACS_UINT
 FILE_SYSTEM_CASE
 FLOAT_CHECK_DOMAIN
-FSCALE
 GC_LISP_OBJECT_ALIGNMENT
 GC_MARK_SECONDARY_STACK
 GC_MARK_STACK
@@ -180,7 +173,6 @@ HAVE_SYS_SYSTEMINFO_H
 HAVE_SYS_TIMEB_H
 HAVE_SYS_TIME_H
 HAVE_TCATTR
-HAVE_TERMIOS_H
 HAVE_TIMEVAL
 HAVE_TM_ZONE
 HAVE_TZSET
@@ -194,8 +186,6 @@ HPUX
 INTERNAL_TERMINAL
 IS_ANY_SEP
 IS_DIRECTORY_SEP
-KERNEL_FILE
-LDAV_SYMBOL
 LINKER
 LINUX_VERSION_CODE
 LISP_FLOAT_TYPE
@@ -244,7 +234,6 @@ SIGNALS_VIA_CHARACTERS
 SIGPIPE
 SIGQUIT
 SIGTRAP
-SIGTYPE
 SOLARIS2
 STDC_HEADERS
 SYSTEM_PURESIZE_EXTRA
@@ -266,14 +255,9 @@ USG5_4
 USG_SUBTTY_WORKS
 VALBITS
 WRETCODE
-XINT
 XOS_NEEDS_TIME_H
-XPNTR
-XSET
-XUINT
 _AIX
 _ARCH_PPC64
-_CALLBACK_
 _FILE_OFFSET_BITS
 _LP64
 _MALLOC_INTERNAL
@@ -281,21 +265,6 @@ _NAIVE_DOS_REGS
 _VARARGS_
 _WINSOCKAPI_
 _WINSOCK_H
-__ELF__
-__FreeBSD__
-__GNUC__
-__GNU_LIBRARY__
-__GNUC_MINOR__
-__NetBSD__
-__OpenBSD__
-__STDC__
-__arch64__
-__cplusplus
-__hpux
-__ia64__
-__linux__
-__mc68000__
-__mips__
 _longjmp
 _setjmp
 _start
@@ -331,9 +300,7 @@ getenv
 getpid
 getuid
 gmtime
-i386
 index
-init_process
 isatty
 kill
 link
@@ -341,7 +308,6 @@ linux
 localtime
 logb
 lseek
-m68k
 malloc
 mkdir
 mktemp
@@ -382,5 +348,3 @@ vfork
 wait
 write
 xfree
-
-# arch-tag: bc80061a-1168-4911-9766-46aaf2640250