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

19 files changed, 40 insertions, 53 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index be321e6dc60..82cb23d6ce8 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -130,7 +130,6 @@ HAVE_CLOSEDIR
 HAVE_CRTIN
 HAVE_DUP2
 HAVE_EUIDACCESS
-HAVE_FACES
 HAVE_FMOD
 HAVE_FPATHCONF
 HAVE_FREXP
@@ -241,7 +240,6 @@ LIB_STANDARD
 LIB_STANDARD_LIBSRC
 LINKER
 LINK_CRTL_SHARE
-LINUX
 LINUX_SBRK_BUG
 LISP_FLOAT_TYPE
 LNOFLSH
@@ -263,7 +261,6 @@ NEED_BSDTTY
 NEED_ERRNO
 NEED_LIBW
 NEED_PTEM_H
-NEED_SIOCTL
 NEED_UNISTD_H
 NLIST_STRUCT
 NOMULTIPLEJOBS
@@ -285,7 +282,6 @@ NSIG_MINIMUM
 NULL
 NULL_DEVICE
 N_BADMAG
-N_PAGSIZ
 N_SYMOFF
 N_TRELOFF
 N_TXTOFF
@@ -331,7 +327,6 @@ SIGQUIT
 SIGTRAP
 SIGTYPE
 SOLARIS2
-SPECIAL_EMACS_INT
 START_FILES
 START_FILES_1
 STDC_HEADERS
@@ -369,7 +364,6 @@ VIRT_ADDR_VARIES
 VMS
 WORDS_BIG_ENDIAN
 WRETCODE
-X11R5_INHIBIT_I18N
 XINT
 XOS_NEEDS_TIME_H
 XPNTR
@@ -379,7 +373,6 @@ _AIX
 _ARCH_PPC64
 _CALLBACK_
 _FILE_OFFSET_BITS
-_GNUC_
 _LP64
 _MALLOC_INTERNAL
 _NAIVE_DOS_REGS
diff --git a/nt/ChangeLog b/nt/ChangeLog
index e574b0e2778..5131e1403b0 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * config.nt (HAVE_FACES): Remove, unused.
+
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
             Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/nt/config.nt b/nt/config.nt
index a7b9334a0a0..231c13948e0 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -82,7 +82,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef HAVE_X_WINDOWS
 #define HAVE_WINDOW_SYSTEM
 #define MULTI_KBOARD
-#define HAVE_FACES
 #define HAVE_MOUSE
 #endif
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 56a471cc1f4..3cd3caf8f1e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,24 @@
+2008-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * 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.
+
 2008-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * syswait.h: Remove old if 0 code.  Do not define WAITTYPE, it was
diff --git a/src/eval.c b/src/eval.c
index e1e0a476662..045d6090a3f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -455,7 +455,7 @@ usage: (progn BODY...)  */)
 }
 
 DEFUN ("prog1", Fprog1, Sprog1, 1, UNEVALLED, 0,
-       doc: /* Eval FIRST and BODY sequentially; value from FIRST.
+       doc: /* Eval FIRST and BODY sequentially; return value from FIRST.
 The value of FIRST is saved during the evaluation of the remaining args,
 whose values are discarded.
 usage: (prog1 FIRST BODY...)  */)
@@ -489,7 +489,7 @@ usage: (prog1 FIRST BODY...)  */)
 }
 
 DEFUN ("prog2", Fprog2, Sprog2, 2, UNEVALLED, 0,
-       doc: /* Eval FORM1, FORM2 and BODY sequentially; value from FORM2.
+       doc: /* Eval FORM1, FORM2 and BODY sequentially; return value from FORM2.
 The value of FORM2 is saved during the evaluation of the
 remaining args, whose values are discarded.
 usage: (prog2 FORM1 FORM2 BODY...)  */)
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.  */
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index c435687bef1..f3d3c4dd578 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -141,13 +141,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define C_SWITCH_SYSTEM -ma -qmaxmem=4000
 #endif
 
-/* The character-composition stuff is broken in X11R5.
-   Even with XIMStatusNothing aliased to XIMStatusNone,
-   tranle@intellicorp.com (Minh Tran-Le) reports that enabling
-   the internationalization code causes the modifier keys C, M and Shift
-   to beep after a mouse click.  */
-#define X11R5_INHIBIT_I18N
-
 /* string.h defines rindex as a macro, at least with native cc, so we
    lose declaring char * rindex without this.
    It is just a guess which versions of AIX need this definition.  */
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 4267da05d4e..1904d71b6c8 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -25,11 +25,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  *      Define all the symbols that apply correctly.
  */
 
-/* #define UNIPLUS */
 /* #define USG5 */
 #define USG
 /* #define BSD_SYSTEM */
-#define LINUX
 #define GNU_LINUX
 
 /* SYSTEM_TYPE should indicate the kind of system you are using.
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 857bf70a9cc..811a682f74c 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -27,8 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "gnu"
 
-#undef NLIST_STRUCT
-
 /* XXX should getloadavg be in libc?  Should we have a libutil?
 #define HAVE_GETLOADAVG */
 #undef NLIST_STRUCT
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index f617490bef2..104f55f9037 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -296,7 +296,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef HAVE_NTGUI
 #define HAVE_WINDOW_SYSTEM 1
-#define HAVE_FACES 1
 #define HAVE_MENUS 1
 #endif
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 73e62ecad6c..43e87bedd30 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -241,9 +241,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 /* We canuse mouse menus.  */
 #define HAVE_MENUS
 
-/* We have support for faces.  */
-#define HAVE_FACES
-
 /* Define one of these for easier conditionals.  */
 #ifdef HAVE_X_WINDOWS
 /* We need a little extra space, see ../../lisp/loadup.el */
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 2dac039c43b..4cc8bed90be 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -50,8 +50,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 
 /* Some versions of V.3 have this, but not all.
-   #define HAVE_PTYS
-   #define SYSV_PTYS  */
+   #define HAVE_PTYS  */
 
 /* Define HAVE_SOCKETS if system supports 4.2-compatible sockets.  */
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 413c302e8c7..6e269e61a0d 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -149,7 +149,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define rindex strrchr
 #define unlink delete
 
-#ifndef _GNUC_
+#ifndef __GNUC__
 extern double mth$dmod(double, double);
 #endif
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 4e9631dbba1..ef56346a313 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1866,7 +1866,7 @@ setup_pty (fd)
      Since the latter lossage is more benign, we may as well
      lose that way.  -- cph */
 #ifdef FIONBIO
-#if defined(SYSV_PTYS) || defined(UNIX98_PTYS)
+#if defined(UNIX98_PTYS)
   {
     int on = 1;
     ioctl (fd, FIONBIO, &on);
diff --git a/src/systty.h b/src/systty.h
index 799b9214e33..6020951ec76 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -109,12 +109,6 @@ static struct sensemode {
 #include <unistd.h>
 #endif
 
-#ifdef SYSV_PTYS
-#include <sys/types.h>
-#include <sys/tty.h>
-#include <sys/pty.h>
-#endif
-
 
 /* Special cases - inhibiting the use of certain features.  */