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, 3 deletions

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;        \
   }