* config.nt (HAVE_FACES): Remove, unused.

* s/vms.h: Use __GNUC__ instead of _GNUC_.

* m/macppc.h:
* m/alpha.h: Use GNU_LINUX instead of LINUX.  Reorganize conditionals.

* m/ibms390x.h (XINT, XUINT): Don't define, same as the default
(SPECIAL_EMACS_INT):
* m/ia64.h (SPECIAL_EMACS_INT):
* m/amdx86-64.h (SPECIAL_EMACS_INT):
* s/gnu.h (NLIST_STRUCT):
* aix4-2.h (X11R5_INHIBIT_I18N):
* s/gnu-linux.h (LINUX):
* s/msdos.h (HAVE_FACES):
* s/ms-w32.h (HAVE_FACES): Don't define, unused.

* systty.h:
* sysdep.c (setup_pty): Don't depend on SYSV_PTYS, it is not used
anymore.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index f1bd6e4b603..2bd42bdf9d2 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -96,12 +96,15 @@ NOTE-END
 #ifdef __ELF__
 #undef UNEXEC
 #define UNEXEC unexelf.o
-#ifndef LINUX
+#ifndef GNU_LINUX
 #define DATA_START    0x140000000
 #endif
+
+#if (defined (__NetBSD__) || defined (__OpenBSD__))
+#define HAVE_TEXT_START
 #endif
 
-#ifndef __ELF__
+#else  /* not __ELF__ */
 
 /* Describe layout of the address space in an executing process.  */
 
@@ -112,9 +115,9 @@ NOTE-END
 
 #define UNEXEC unexalpha.o
 
-#endif /* notdef __ELF__ */
+#endif /* __ELF__ */
 
-#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
+#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
 /* This controls a conditional in main.  */
 #define LINUX_SBRK_BUG
 #endif
@@ -123,7 +126,7 @@ NOTE-END
    termio and struct termios are mutually incompatible.  */
 #define NO_TERMIO
 
-#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
+#if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
 # define TEXT_END ({ extern int _etext; &_etext; })
 # ifndef __ELF__
 #  define COFF
@@ -131,10 +134,6 @@ NOTE-END
 # endif /* notdef __ELF__ */
 #endif
 
-#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
-#define HAVE_TEXT_START
-#endif
-
 /* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
    they generate code that uses a signaling NaN instead of DBL_MIN.
    Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN: