Conditionalize for SunOS 4.1.?

diff --git a/v7/src/microcode/ux.c b/v7/src/microcode/ux.c
index 3d18920138ca90ca9c2904fde7a2e6c2404cf4b1..32f6e04553f2640461e6945b302343f3a6e0f7fe 100644 (file)
--- a/v7/src/microcode/ux.c
+++ b/v7/src/microcode/ux.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.c,v 1.11 1993/02/18 05:15:19 gjr Exp $
+$Id: ux.c,v 1.12 1993/10/27 22:16:43 gjr Exp $
 
 Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
@@ -415,7 +415,7 @@ DEFUN_VOID (UX_SC_CLK_TCK)
 
 #endif /* _POSIX */
 \f
-#ifndef _POSIX
+#ifndef HAVE_SIGSET_OPS
 
 int
 DEFUN (UX_sigemptyset, (set), sigset_t * set)

diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index f56fb6b114b625e1c6d0172b29fee8989173ea55..2a65715645c97662c617c893fc486a96b65f7dda 100644 (file)
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.52 1993/09/09 18:19:58 gjr Exp $
+$Id: ux.h,v 1.53 1993/10/27 22:17:55 gjr Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -59,7 +59,7 @@ extern int errno;
 
 /* These seem to be missing from versions of unistd.h */
 
-#if !(defined(_HPUX) || defined(sonyrisc))
+#if !(defined(_HPUX) || defined(sonyrisc) || defined(_SUNOS4))
 /* As specified by OSF/1 Programmer's reference: */
 extern int EXFUN (ioctl, (int, unsigned long, ...));
 #endif
@@ -999,6 +999,8 @@ extern int EXFUN (UX_sigsuspend, (CONST sigset_t * set));
 \f
 #ifdef _POSIX
 
+#define HAVE_SIGSET_OPS
+
 #ifdef EMULATE_FPATHCONF
 
 /* These values match HP-UX, and the index in the table in the 
@@ -1047,6 +1049,10 @@ extern clock_t EXFUN (UX_SC_CLK_TCK, (void));
 
 #else /* not _POSIX */
 
+#ifdef _SUNOS4
+#define HAVE_SIGSET_OPS
+#endif
+
 #define UX_PC_VDISABLE(fildes) '\377'
 
 #ifdef OPEN_MAX

diff --git a/v7/src/microcode/uxio.c b/v7/src/microcode/uxio.c
index 5da3afdfb1d8b595573b48e4d1e50e1c3526336f..77b386fbbb5ac5f111d59a8df4ee53da0e0ffebd 100644 (file)
--- a/v7/src/microcode/uxio.c
+++ b/v7/src/microcode/uxio.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxio.c,v 1.31 1993/09/09 23:03:19 cph Exp $
+$Id: uxio.c,v 1.32 1993/10/27 22:18:36 gjr Exp $
 
 Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
@@ -368,7 +368,7 @@ DEFUN (OS_channel_blocking, (channel), Tchannel channel)
 \f
 /* select(2) system call */
 
-#if defined(_HPUX) && (_HPUX_VERSION >= 80)
+#if (defined(_HPUX) && (_HPUX_VERSION >= 80)) || defined(_SUNOS4)
 #define SELECT_DECLARED
 #endif
 

diff --git a/v7/src/microcode/uxsock.c b/v7/src/microcode/uxsock.c
index 7059372443b5d5744016afc1629fb44d189e9d5d..16ff18af47eb1bdf3a8a471b6509da806ae6b7f8 100644 (file)
--- a/v7/src/microcode/uxsock.c
+++ b/v7/src/microcode/uxsock.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxsock.c,v 1.12 1993/09/09 18:21:59 gjr Exp $
+$Id: uxsock.c,v 1.13 1993/10/27 22:19:14 gjr Exp $
 
 Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
@@ -48,7 +48,9 @@ MIT in each case. */
 #include "prims.h"
 #include "limits.h"
 
+#ifndef _SUNOS4
 extern struct servent * EXFUN (getservbyname, (CONST char *, CONST char *));
+#endif
 extern struct hostent * EXFUN (gethostbyname, (CONST char *));
 \f
 Tchannel