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.

1 files changed, 3 insertions, 20 deletions

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.