* 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.

5 files changed, 10 insertions, 18 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:
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 34800af8e9d..781247fa9f4 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -52,7 +52,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define the type to use.  */
 #define EMACS_INT               long
 #define EMACS_UINT              unsigned long
-#define SPECIAL_EMACS_INT
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 960228afe40..1e2d2800f9c 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -42,7 +42,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define the type to use.  */
 #define EMACS_INT               long
 #define EMACS_UINT              unsigned long
-#define SPECIAL_EMACS_INT
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 31efa03f480..14f6509fdb7 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -48,7 +48,6 @@ NOTE-END */
 /* Define the type to use.  */
 #define EMACS_INT long
 #define EMACS_UINT unsigned long
-#define SPECIAL_EMACS_INT
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
@@ -126,10 +125,6 @@ NOTE-END */
 
 #define LINKER $(CC) -nostdlib
 
-/* Define XINT and XUINT so that they can take arguments of type int */
-#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-#define XUINT(a) ((long) (a) & VALMASK)
-
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 
 #define XPNTR(a) XUINT (a)
diff --git a/src/m/macppc.h b/src/m/macppc.h
index c0e53c2e063..eeb9990562e 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -54,7 +54,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* #define NO_SOCK_SIGIO */
 
-#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
+#if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
 # define TEXT_END ({ extern int _etext; &_etext; })
 #endif
 
@@ -65,7 +65,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> says this is needed
    For MkLinux/LinuxPPC.  */
 
-#ifdef LINUX
+#ifdef GNU_LINUX
 #define LINKER $(CC) -nostdlib
 /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
    because prefix-args is not used.  */