s/usg5-4.h:

(NSIG): Remove.
(NSIG_MINIMUM): New macro.
s/gnu-linux.h, s/hpux.h, s/iris3-5.h, s/iris3-6.h,
s/umips.h, s/usg5-4.h:
(SIGIO): Do not undef.
(BROKEN_SIGIO): New macro.

* s/gnu-linux.h:
(SIGPOLL, SIGURG): Do not undef.
(BROKEN_SIGPOLL, BROKEN_SIGURG): New macros.

* s/ptx4.h:
(SIGINFO): Do not undef.
(BROKEN_SIGINFO): New macros.

* s/ptx.h, s/template.h: Doc fix.

* s/aix3-1.h, s/bsd4-1.h, s/dgux.h, s/gnu-linux.h, s/hiuxmpp.h,
s/hpux.h, s/iris3-5.h, s/iris3-6.h, s/irix3-3.h, s/osf1.h, s/rtu.h,
s/sunos4-1.h, s/unipl5-0.h, s/unipl5-2.h, s/usg5-0.h, s/usg5-2-2.h,
s/usg5-2.h, s/usg5-3.h, s/xenix.h:
(open, close, read, write, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE, INTERRUPTIBLE_IO): Remove.

* s/sol2-5.h (_LARGEFILE_SOURCE, _FILE_OFFSET_BITS): New macros.

26 files changed, 47 insertions, 289 deletions

diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index ab82ae0d3a0..f9c3cbeeba7 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on IBM AIX version 3.1
-   Copyright (C) 1985, 1986, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -168,20 +168,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 9bca58f08b5..b0b7246e909 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on bsd 4.1.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -122,10 +122,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define lstat stat
 
-/* sys_open handles the necessary 4.2 features for open.  */
-
-#define open sys_open
-
 /* Names of flags for open.  */
 #define O_RDONLY 0
 #define O_WRONLY 1
diff --git a/src/s/dgux.h b/src/s/dgux.h
index 633777a0e26..5e958a59d61 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 4.32 upto and including 5.4.1.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -252,17 +252,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define POSIX_SIGNALS
 
-/* Define this if you use System 5 Release 4 Streams */
-#define open  sys_open
-#define close sys_close
-#define read  sys_read
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-/* can't hurt to define these, even though read/write should auto restart */
-#define INTERRUPTIBLE_IO
-
 #ifndef NO_DGUX_SIGNAL_REDEF
 /* Can't use sys_signal because then etc/server.c would need sysdep.o.  */
 extern struct sigaction act, oact;
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 2b9a80cf1a8..68b3e8d5a41 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,5 +1,5 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 1986, 1992, 1994, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 92, 94, 96, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -112,22 +112,6 @@ Boston, MA 02111-1307, USA.  */
    your system and must be used only through an encapsulation
    (Which you should place, by convention, in sysdep.c).  */
 
-/* On POSIX systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define write sys_write
-#define open sys_open
-#define close sys_close
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
 /* If you mount the proc file system somewhere other than /proc
    you will have to uncomment the following and make the proper
    changes */
@@ -172,16 +156,15 @@ Boston, MA 02111-1307, USA.  */
 
 /* As of version 1.1.51, Linux did not actually implement SIGIO.
    But it works in newer versions.  */
-/* Here we assume that signal.h is already included.  */
 #ifdef emacs
 #ifdef LINUX_SIGIO_DOES_WORK
 #define INTERRUPT_INPUT
 #else
-#undef SIGIO
+#define BROKEN_SIGIO
 /* Some versions of Linux define SIGURG and SIGPOLL as aliases for SIGIO.
    This prevents lossage in process.c.  */
-#undef SIGURG
-#undef SIGPOLL
+#define BROKEN_SIGURG
+#define BROKEN_SIGPOLL
 #endif
 #endif
 
diff --git a/src/s/hiuxmpp.h b/src/s/hiuxmpp.h
index 022eb40562b..2ad57403fb7 100644
--- a/src/s/hiuxmpp.h
+++ b/src/s/hiuxmpp.h
@@ -24,15 +24,6 @@
 
 #define GETPGRP_NO_ARG
 
-#define read sys_read
-#define write sys_write
-#define open sys_open
-#define close sys_close
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
 #define SYSV_SYSTEM_DIR
 
 /* If your system uses COFF (Common Object File Format) then define the
diff --git a/src/s/hpux.h b/src/s/hpux.h
index 5b1f42d1501..69290ea802d 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on HPUX release 7.0.
    Based on AT&T System V.2.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -155,20 +155,6 @@ Boston, MA 02111-1307, USA.  */
 #define _longjmp longjmp
 */
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* Use the system provided termcap(3) library */
 #define TERMINFO
 
@@ -178,12 +164,9 @@ Boston, MA 02111-1307, USA.  */
 #define srandom srand48
 
 /* In hpux, the symbol SIGIO is defined, but the feature
-   doesn't work in the way Emacs needs it to.
-
-   Here we assume that signal.h is included before config.h
-   so that we can override it here.  */
+   doesn't work in the way Emacs needs it to.  */
 
-#undef SIGIO
+#define BROKEN_SIGIO
 
 /* USG systems tend to put everything declared static
    into the initialized data area, which becomes pure after dumping Emacs.
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index c3d576cfde2..7659289ad9b 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics 3.5
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -127,7 +127,7 @@ Boston, MA 02111-1307, USA.  */
 #define sigsetmask(mask)        /* Null expansion */
 
 /* The IRIS defines SIGIO in signal.h, but doesn't implement it. */
-#undef SIGIO
+#define BROKEN_SIGIO
 
 #define LIBS_MACHINE -lbsd -ldbm -lPW
 #define C_SWITCH_MACHINE -I/usr/include/bsd
@@ -138,20 +138,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index 8b5d7495424..80a4ccc5e85 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -128,7 +128,7 @@ Boston, MA 02111-1307, USA.  */
 #define sigblock(x) x
 
 /* The IRIS defines SIGIO in signal.h, but doesn't implement it. */
-#undef SIGIO
+#define BROKEN_SIGIO
 
 #define LIBS_MACHINE -lbsd -ldbm -lPW
 #define C_SWITCH_MACHINE -I/usr/include/bsd
@@ -139,20 +139,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index e41b05d7069..45961cc1b2b 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
-   Copyright (C) 1987,1990 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -125,20 +125,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/osf1.h b/src/s/osf1.h
index 133ec88dd85..d0e11fcf3ca 100644
--- a/src/s/osf1.h
+++ b/src/s/osf1.h
@@ -12,15 +12,6 @@
 
 #define GETPGRP_NO_ARG
 
-#define read sys_read
-#define write sys_write
-#define open sys_open
-#define close sys_close
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
 #define SYSV_SYSTEM_DIR
 
 /* If your system uses COFF (Common Object File Format) then define the
diff --git a/src/s/ptx.h b/src/s/ptx.h
index d9d223d1cc5..6fff6de543c 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
-   Copyright (C) 1987, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -84,7 +84,7 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/stropts.h>        /* Support for pty's */
 #include <sys/conf.h>
 
-/*#undef SIGIO*/                /* SIGIO is already undef'd elsewhere. PTX
+/*#define BROKEN_SIGIO*/        /* BROKEN_SIGIO is already defined. PTX
                                    has SIGIO, but it's just an alias for
                                    SIGPOLL.  */
 
diff --git a/src/s/ptx4.h b/src/s/ptx4.h
index 25cf6882986..32cbb26586d 100644
--- a/src/s/ptx4.h
+++ b/src/s/ptx4.h
@@ -8,7 +8,7 @@
 /* Marcus Daniels <marcus@sysc.pdx.edu> says that SIGINFO is defined
    on ptx4 but it is not a signal.  Prevent process.c from doing the
    wrong thing.  */
-#undef SIGINFO
+#define BROKEN_SIGINFO
 
 /* Marcus Daniels <marcus@sysc.pdx.edu> says vfork does exist.  */
 #define HAVE_VFORK
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 45266f2716d..9b655db2f51 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -127,20 +127,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Special hacks needed to make Emacs run on this system.  */
 
-/* On RTU systems (like USG) the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* The "fsync" call on RTU versions 3.0 and 3.1 is badly broken!
    This hack below isn't the best solution, but without it this
    program will cause the whole system to hang!  !@#$#%$ Masscomp!  */
diff --git a/src/s/sol2-3.h b/src/s/sol2-3.h
index 9d9018aa0be..a4fc6097905 100644
--- a/src/s/sol2-3.h
+++ b/src/s/sol2-3.h
@@ -39,12 +39,12 @@
                                                 \
     sigblock (sigmask (SIGCLD));                \
     if (grantpt (fd) == -1)                     \
-      { close (fd); return -1; }                \
+      { emacs_close (fd); return -1; }          \
     sigunblock (sigmask (SIGCLD));              \
     if (unlockpt (fd) == -1)                    \
-      { close (fd); return -1; }                \
+      { emacs_close (fd); return -1; }          \
     if (!(ptyname = ptsname (fd)))              \
-      { close (fd); return -1; }                \
+      { emacs_close (fd); return -1; }          \
     strncpy (pty_name, ptyname, sizeof (pty_name)); \
     pty_name[sizeof (pty_name) - 1] = 0;        \
   }
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h
index ffb3c2d5528..d80c22b37ba 100644
--- a/src/s/sol2-5.h
+++ b/src/s/sol2-5.h
@@ -1,5 +1,14 @@
 /* Handle Solaris 2.5.  */
 
+/* Enable large-file support if available (Solaris 2.6 and later).
+   Do this before including any system include file.  */
+#ifndef _LARGEFILE_SOURCE
+#define _LARGEFILE_SOURCE 1
+#endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+
 #include "sol2-4.h"
 
 /* -lgen is needed for the regex and regcmp functions
diff --git a/src/s/sunos4-1.h b/src/s/sunos4-1.h
index 7aa0946d381..9c6b9cede23 100644
--- a/src/s/sunos4-1.h
+++ b/src/s/sunos4-1.h
@@ -1,16 +1,5 @@
 #include "sunos4-0.h"
 
-/* 4.1.1 makes these system calls interruptible.  */
-
-#define read sys_read
-#define write sys_write
-#define open sys_open
-#define close sys_close
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
 /* Cause the compilation of oldxmenu to use the right -I option.  */
 #define OLDXMENU_OPTIONS CFLAGS=C_SWITCH_SYSTEM
 
diff --git a/src/s/template.h b/src/s/template.h
index 7f49ca3047e..070e5ed259f 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -54,8 +54,8 @@ Boston, MA 02111-1307, USA.  */
 
    Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO)
 
-   Emacs uses the presence or absence of the SIGIO macro to indicate
-   whether or not signal-driven I/O is possible.  It uses
+   Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros
+   to indicate whether or not signal-driven I/O is possible.  It uses
    INTERRUPT_INPUT to decide whether to use it by default.
 
    SIGIO can be used only on systems that implement it (4.2 and 4.3).
diff --git a/src/s/umips.h b/src/s/umips.h
index 07a4cd6bbb0..17590c493cf 100644
--- a/src/s/umips.h
+++ b/src/s/umips.h
@@ -36,7 +36,7 @@
 #undef static
 
 /* Don't try to use SIGIO or FIONREAD even though they are defined.  */
-#undef SIGIO
+#define BROKEN_SIGIO
 #define BROKEN_FIONREAD
 
 /* Describe special kernel features.  */
diff --git a/src/s/unipl5-0.h b/src/s/unipl5-0.h
index 465c654f370..4c815d917e1 100644
--- a/src/s/unipl5-0.h
+++ b/src/s/unipl5-0.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.0
    Support for this system is not finished; don't expect this to work.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -148,20 +148,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index df505e48f16..85ab0973fe8 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -142,20 +142,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index cf31a3d1404..915211feb9c 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V.0
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -137,20 +137,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index 98698f2fefb..14b7fa3d335 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -136,20 +136,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 51b73bda462..7c8cb134094 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -136,20 +136,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 01eea23c4b6..f3bd5d38f6e 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 3
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -151,22 +151,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define write sys_write
-#define open sys_open
-#define close sys_close
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_CLOSE
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 #define index strchr
 #define rindex strrchr
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 8681cee6acc..2c10a7550c7 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -95,17 +95,14 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/stream.h>
 #include <sys/stropts.h>
 #include <sys/termios.h>
-#undef SIGIO
+#define BROKEN_SIGIO
 #endif
 
 /* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
  * instead, there's a system variable _sys_nsig.  Unfortunately, we need the
  * constant to dimension an array.  So wire in the appropriate value here.
  */
-
-#ifndef NSIG
-#define NSIG    32
-#endif
+#define NSIG_MINIMUM 32
 
 /* We need bss_end from emacs.c for undumping */
 
@@ -162,12 +159,12 @@ Boston, MA 02111-1307, USA.  */
                                                         \
     sighold (SIGCLD);                                   \
     if (grantpt (fd) == -1)                             \
-      { close (fd); return -1; }                        \
+      { emacs_close (fd); return -1; }                  \
     sigrelse (SIGCLD);                                  \
     if (unlockpt (fd) == -1)                            \
-      { close (fd); return -1; }                        \
+      { emacs_close (fd); return -1; }                  \
     if (!(ptyname = ptsname (fd)))                      \
-      { close (fd); return -1; }                        \
+      { emacs_close (fd); return -1; }                  \
     strncpy (pty_name, ptyname, sizeof (pty_name));     \
     pty_name[sizeof (pty_name) - 1] = 0;                \
   }
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 74c14f818d0..7550baa4cd4 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -1,5 +1,5 @@
 /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -168,20 +168,6 @@ Boston, MA 02111-1307, USA.  */
 #define _setjmp setjmp
 #define _longjmp longjmp
 
-/* On USG systems the system calls are interruptible by signals
- that the user program has elected to catch.  Thus the system call
- must be retried in these cases.  To handle this without massive
- changes in the source code, we remap the standard system call names
- to names for our own functions in sysdep.c that do the system call
- with retries. */
-
-#define read sys_read
-#define open sys_open
-#define write sys_write
-
-#define INTERRUPTIBLE_OPEN
-#define INTERRUPTIBLE_IO
-
 /* On USG systems these have different names */
 
 #define index strchr