* configure.in: Remove references to obsolete variables and

systems.
* configure: Regenerate.

* Makefile.in (NO_SHORTNAMES):
* emacsclient.c (NO_SHORTNAMES):
* fakemail.c (NO_SHORTNAMES):
* make-docfile.c (NO_SHORTNAMES):
* movemail.c (NO_SHORTNAMES):
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.

* config.nt (SHORTNAMES): Remove reference to obsolete variable.

* s/vms4-0.h:
* s/vms4-2.h:
* s/vms4-4.h:
* s/vms5-5.h: Remove, unused.

* s/irix5-2.h:
* s/irix6-0.h:
* s/riscos5.h:
* s/mach-bsd4-3.h:
* m/mips4.h: Remove files for obsolete systems

* Makefile.in:
* filelock.c:
* unexmips.c:
* m/hp9000s300.h:
* m/iris4d.h:
* s/aix3-1.h:
* s/hpux.h:
* s/msdos.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-3.h: Remove references to obsolete variables.

* s/irix5-0.h: Remove, move all the contents ...
* s/irix6-5.h: ... here.  Simplify.
* config.in: Regenerate.

17 files changed, 106 insertions, 330 deletions

diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index fe09df5f51..50368cf86a 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -134,12 +134,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* #define CLASH_DETECTION */
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.  */
-
-/* #define SHORTNAMES */
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 1a9b2b8489..fd8bf927f9 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -115,16 +115,6 @@ Boston, MA 02110-1301, USA.  */
 
 #define CLASH_DETECTION
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.
-
-   Some USG systems support long names.
-   If yours is one, DO NOT change this file!
-   Do #undef SHORTNAMES in the m- file or in config.h.  */
-
-/* #define SHORTNAMES */
-
 /* The file containing the kernel's symbol table is called /hp-ux.  */
 
 #define KERNEL_FILE "/hp-ux"
diff --git a/src/s/irix5-0.h b/src/s/irix5-0.h
deleted file mode 100644
index 2d126ff5fd..0000000000
--- a/src/s/irix5-0.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 5.0.
-
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-#include "usg5-4.h"
-
-#define IRIX5
-
-#undef sigsetmask  /* use sys_sigsetmask */
-#undef _longjmp /* use system versions, not conservative aliases */
-#undef _setjmp
-
-#define SETPGRP_RELEASES_CTTY
-
-#ifdef LIBS_SYSTEM
-#undef LIBS_SYSTEM
-#endif
-
-#ifdef LIB_STANDARD
-#undef LIB_STANDARD
-#endif
-
-#ifdef SYSTEM_TYPE
-#undef SYSTEM_TYPE
-#endif
-#define SYSTEM_TYPE "irix"
-
-#ifdef SETUP_SLAVE_PTY
-#undef SETUP_SLAVE_PTY
-#endif
-
-/* [email protected] says this is needed.  */
-/* Make process_send_signal work by "typing" a signal character on the pty.  */
-#define SIGNALS_VIA_CHARACTERS
-
-/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
-   because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.)  Instead
-   we'll just define WNOHANG right here.
-   (An implicit decl is good enough for wait3.)  */
-
-/* #define WNOHANG		0x1 */
-
-/* No need to use sprintf to get the tty name--we get that from _getpty.  */
-#ifdef PTY_TTY_NAME_SPRINTF
-#undef PTY_TTY_NAME_SPRINTF
-#endif
-#define PTY_TTY_NAME_SPRINTF
-/* No need to get the pty name at all.  */
-#ifdef PTY_NAME_SPRINTF
-#undef PTY_NAME_SPRINTF
-#endif
-#define PTY_NAME_SPRINTF
-#ifdef emacs
-char *_getpty();
-#endif
-/* We need only try once to open a pty.  */
-#define PTY_ITERATION
-/* Here is how to do it.  */
-#define PTY_OPEN					    \
-{							    \
-  struct sigaction ocstat, cstat;			    \
-  char * name;						    \
-  sigemptyset(&cstat.sa_mask);				    \
-  cstat.sa_handler = SIG_DFL;				    \
-  cstat.sa_flags = 0;					    \
-  sigaction(SIGCLD, &cstat, &ocstat);			    \
-  name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0);	    \
-  sigaction(SIGCLD, &ocstat, (struct sigaction *)0);	    \
-  if (name == 0)					    \
-    return -1;						    \
-  if (fd < 0)						    \
-    return -1;						    \
-  if (fstat (fd, &stb) < 0)				    \
-    return -1;						    \
-  strcpy (pty_name, name);				    \
-}
-
-/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
-   throughout. */
-#define POSIX_SIGNALS
-
-/* Info from [email protected] (Simon Leinen) suggests this is needed.  */
-#define GETPGRP_NO_ARG
-
-/* Ulimit(UL_GMEMLIM) is busted...  */
-#define ULIMIT_BREAK_VALUE 0x14000000
-
-/* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
-#define PREFER_VSUSP
-
-/* define MAIL_USE_FLOCK if the mailer uses flock
-   to interlock access to /usr/spool/mail/$USER.
-   The alternative is that a lock file named
-   /usr/spool/mail/$USER.lock.  */
-
-#define MAIL_USE_FLOCK
-
-/* use K&R C */
-#if 0
-#ifndef __GNUC__
-#define C_SWITCH_SYSTEM -cckr
-#endif
-#endif
-
-/* -g used not to work on Irix unless you used gas, and since gcc
-   warns if you use it, turn off the warning.  */
-/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
-    I'm not sure about Irix 5 -- fx  */
-#ifdef __GNUC__
-#define C_DEBUG_SWITCH
-#endif
-
-/* Prevent the variable ospeed from being defined by -lcurses
-   because it defines it with too few bytes.  */
-#define ospeed ospeed_
-
-#define NARROWPROTO 1
-
-#define USE_MMAP_FOR_BUFFERS 1
-
-/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
-   (do not change this comment) */
diff --git a/src/s/irix5-2.h b/src/s/irix5-2.h
deleted file mode 100644
index b9cca67acd..0000000000
--- a/src/s/irix5-2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "irix5-0.h"
-
-/* as of version 5.2, irix no longer uses flock,
-   according to [email protected].  */
-#undef MAIL_USE_FLOCK
-
-/* C-g in select is not handled properly with restartable
-   system calls.  So don't use them.  */
-#undef SA_RESTART
-
-/* [email protected] reports he needed -lw with X11R6
-   on Irix 5.3.  I don't know which Irix version that need starts with.  */
-#define NEED_LIBW
-
-/* Looking at the wtmp file in filelock.c causes a crash
-   for [email protected].
-   Note that irix6-0.h does not include this file, only irix5-0.h.  */
-#define NO_WTMP_FILE
-
-/* arch-tag: e2f820c1-2a3e-4cee-b5f1-6ce8ab21f439
-   (do not change this comment) */
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
deleted file mode 100644
index 00c948ce1e..0000000000
--- a/src/s/irix6-0.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.0.
-
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-#include "irix5-0.h"
-
-/* Irix 6 tries to do 64 bits, but doesn't do it fully,
-   so inhibit that.  */
-#define IRIX_FORCE_32_BITS
-
-#ifndef __GNUC__
-#define LD_SWITCH_SYSTEM -32
-#endif
-
-/* This macro definition, which we inherited from irix5-0.h,
-   is needed in configure on Irix 5, but gets in the way there
-   on Irix 6.  So get rid of it except in Makefile.in where we need it.  */
-#ifndef THIS_IS_MAKEFILE
-#undef C_SWITCH_SYSTEM
-#endif
-
-/* The only supported 32-bit configuration of GCC under IRIX6.x produces
-   n32 MIPS ABI binaries and also supports -g. */
-#ifdef __GNUC__
-#undef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -g
-#endif
-
-#undef SA_RESTART
-
-/* It turns out that the #define in irix5-0.h is needed in Irix 6 as well.  */
-#if 0
-/* Cancel the #define that is in irix5-0.h.  */
-#undef ospeed
-#endif
-
-#undef TIOCSIGSEND
-
-/* Tested on Irix 6.5.  SCM worked on earlier versions.  */
-#define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: a775e465-a619-4655-a58f-5982aad0c624
-   (do not change this comment) */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 537e797562..d676e13ec7 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -22,19 +22,117 @@ Boston, MA 02110-1301, USA.  */
 
 
 #define IRIX6_5			/* used in m/iris4d */
-#include "irix5-0.h"
+#include "usg5-4.h"
+
+#undef sigsetmask  /* use sys_sigsetmask */
+#undef _longjmp /* use system versions, not conservative aliases */
+#undef _setjmp
+
+#define SETPGRP_RELEASES_CTTY
+
+#ifdef LIBS_SYSTEM
+#undef LIBS_SYSTEM
+#endif
+
+#ifdef LIB_STANDARD
+#undef LIB_STANDARD
+#endif
+
+#ifdef SYSTEM_TYPE
+#undef SYSTEM_TYPE
+#endif
+#define SYSTEM_TYPE "irix"
+
+#ifdef SETUP_SLAVE_PTY
+#undef SETUP_SLAVE_PTY
+#endif
+
+/* [email protected] says this is needed.  */
+/* Make process_send_signal work by "typing" a signal character on the pty.  */
+#define SIGNALS_VIA_CHARACTERS
+
+/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
+   because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.)  Instead
+   we'll just define WNOHANG right here.
+   (An implicit decl is good enough for wait3.)  */
+
+/* #define WNOHANG		0x1 */
+
+/* No need to use sprintf to get the tty name--we get that from _getpty.  */
+#ifdef PTY_TTY_NAME_SPRINTF
+#undef PTY_TTY_NAME_SPRINTF
+#endif
+#define PTY_TTY_NAME_SPRINTF
+/* No need to get the pty name at all.  */
+#ifdef PTY_NAME_SPRINTF
+#undef PTY_NAME_SPRINTF
+#endif
+#define PTY_NAME_SPRINTF
+#ifdef emacs
+char *_getpty();
+#endif
+/* We need only try once to open a pty.  */
+#define PTY_ITERATION
+/* Here is how to do it.  */
+#define PTY_OPEN					    \
+{							    \
+  struct sigaction ocstat, cstat;			    \
+  char * name;						    \
+  sigemptyset(&cstat.sa_mask);				    \
+  cstat.sa_handler = SIG_DFL;				    \
+  cstat.sa_flags = 0;					    \
+  sigaction(SIGCLD, &cstat, &ocstat);			    \
+  name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0);	    \
+  sigaction(SIGCLD, &ocstat, (struct sigaction *)0);	    \
+  if (name == 0)					    \
+    return -1;						    \
+  if (fd < 0)						    \
+    return -1;						    \
+  if (fstat (fd, &stb) < 0)				    \
+    return -1;						    \
+  strcpy (pty_name, name);				    \
+}
+
+/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
+   throughout. */
+#define POSIX_SIGNALS
+
+/* Info from [email protected] (Simon Leinen) suggests this is needed.  */
+#define GETPGRP_NO_ARG
+
+/* Ulimit(UL_GMEMLIM) is busted...  */
+#define ULIMIT_BREAK_VALUE 0x14000000
+
+/* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
+#define PREFER_VSUSP
+
+/* define MAIL_USE_FLOCK if the mailer uses flock
+   to interlock access to /usr/spool/mail/$USER.
+   The alternative is that a lock file named
+   /usr/spool/mail/$USER.lock.  */
+
+#define MAIL_USE_FLOCK
+
+/* -g used not to work on Irix unless you used gas, and since gcc
+   warns if you use it, turn off the warning.  */
+/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
+    I'm not sure about Irix 5 -- fx  */
+#ifdef __GNUC__
+#define C_DEBUG_SWITCH
+#endif
+
+#define NARROWPROTO 1
+
+#define USE_MMAP_FOR_BUFFERS 1
+
+/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
+   (do not change this comment) */
+
 
 #if _MIPS_SZLONG == 64		/* -mabi=64 (gcc) or -64 (MIPSpro) */
 #define _LP64			/* lisp.h takes care of the rest */
 #endif /* _MIPS_SZLONG */
 
-/* This macro definition, which we inherited from irix5-0.h,
-   is needed in configure on Irix 5, but gets in the way there
-   on Irix 6.  So get rid of it except in Makefile.in where we need it.  */
-#ifndef THIS_IS_MAKEFILE
-#undef C_SWITCH_SYSTEM
-#endif
-
 /* The only supported 32-bit configuration of GCC under IRIX6.x produces
    n32 MIPS ABI binaries and also supports -g. */
 #ifdef __GNUC__
@@ -51,9 +149,6 @@ Boston, MA 02110-1301, USA.  */
 
 #undef SA_RESTART
 
-/* Cancel the #define that is in irix5-0.h.  */
-#undef ospeed
-
 #undef TIOCSIGSEND		/* defined in usg5-4.h */
 
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
diff --git a/src/s/mach-bsd4-3.h b/src/s/mach-bsd4-3.h
deleted file mode 100644
index e012679c5f..0000000000
--- a/src/s/mach-bsd4-3.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* I don't care if this doesn't do more than including bsd4-3.h;
-   Mach is not bsd4-3 and the moment you forget it chances are that
-   you're in deep shit.  */
-
-#include "bsd4-3.h"
-
-/* arch-tag: 7f7f00f6-ae34-413e-9e6a-1d3b3e3d07e8
-   (do not change this comment) */
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 61289fdc2c..21c0eaf430 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -160,8 +160,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #if __DJGPP__ < 2
 
-#define NO_MODE_T
-
 /* New chdir () routine.
    DJGPP v2.0 and later doesn't need it because its chdir() does
    set the drive itself. */
diff --git a/src/s/riscos5.h b/src/s/riscos5.h
deleted file mode 100644
index 6ebf412c1d..0000000000
--- a/src/s/riscos5.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "bsd4-3.h"
-
-/* This file has changes that Jost Krieger <[email protected]>
-   says are necessary.  */
-
-/* No declaration in system header files.  */
-extern double atof ();
-
-#define LD_SWITCH_SYSTEM -non_shared
-
-#define GETPGRP_NO_ARG
-
-/* arch-tag: e8ddf21d-72a0-476d-b33e-364f8b20e3b7
-   (do not change this comment) */
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 652b6a862f..9b4aad5367 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -103,12 +103,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* #define CLASH_DETECTION */
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.  */
-
-#define SHORTNAMES
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index 6f80b7fc41..a76c029439 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* #define CLASH_DETECTION */
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.  */
-
-/* #define SHORTNAMES */
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 1d4bf597fd..ad2f2aeef3 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* #define CLASH_DETECTION */
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.  */
-
-/* #define SHORTNAMES */
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index f518ee96b8..0974f6ced8 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -113,12 +113,6 @@ Boston, MA 02110-1301, USA.  */
 
 /* #define CLASH_DETECTION */
 
-/* Define SHORTNAMES if the C compiler can distinguish only
-   short names.  It means that the stuff in ../shortnames
-   must be run to convert the long names to short ones.  */
-
-/* #define SHORTNAMES */
-
 /* The file containing the kernel's symbol table is called /unix.  */
 
 #define KERNEL_FILE "/unix"
diff --git a/src/s/vms4-0.h b/src/s/vms4-0.h
deleted file mode 100644
index c7e0c7be58..0000000000
--- a/src/s/vms4-0.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "vms.h"
-#define VMS4_0
-
-/* arch-tag: 734e1c69-d514-4441-bbcd-8b5db8ab1892
-   (do not change this comment) */
diff --git a/src/s/vms4-2.h b/src/s/vms4-2.h
deleted file mode 100644
index 01ee788dd6..0000000000
--- a/src/s/vms4-2.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "vms.h"
-#define VMS4_2
-
-/* arch-tag: d9ff67bc-a899-44b2-a618-a73c821bb559
-   (do not change this comment) */
diff --git a/src/s/vms4-4.h b/src/s/vms4-4.h
deleted file mode 100644
index 7491f5c8f8..0000000000
--- a/src/s/vms4-4.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "vms.h"
-#define VMS4_4
-
-#undef NO_HYPHENS_IN_FILENAMES
-
-/* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
-   (do not change this comment) */
diff --git a/src/s/vms5-5.h b/src/s/vms5-5.h
deleted file mode 100644
index 83b08b4281..0000000000
--- a/src/s/vms5-5.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "vms.h"
-#define VMS5_5
-#define VMS4_4
-
-#undef NO_HYPHENS_IN_FILENAMES
-
-/* The bug that SHARABLE_LIB_BUG fixes is gone in version 5.5 of VMS.
-   And defining it causes lossage because sys_errlist has a different
-   number of elements.  */
-#undef SHARABLE_LIB_BUG
-
-/* arch-tag: 92acc416-61fe-44ae-b0e0-710cb9e38ec6
-   (do not change this comment) */