You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@hyperreal.org on 1998/09/23 20:50:26 UTC
cvs commit: apache-2.0/nsprpub/pr/src/md/unix unix.c
jim 98/09/23 11:50:26
Modified: nsprpub/config nsinstall.c
nsprpub/pr/include/md _aux.h
nsprpub/pr/src/io prfile.c
nsprpub/pr/src/malloc prmalloc.c
nsprpub/pr/src/md prosdep.c
nsprpub/pr/src/md/unix unix.c
Log:
Add some more 'safe' patches and reverse that
strange LINUX->linux rename that somehow got folded in
Revision Changes Path
1.3 +3 -3 apache-2.0/nsprpub/config/nsinstall.c
Index: nsinstall.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/config/nsinstall.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nsinstall.c 1998/09/23 01:18:29 1.2
+++ nsinstall.c 1998/09/23 18:50:22 1.3
@@ -38,7 +38,7 @@
#define HAVE_LCHOWN
-#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(linux) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(RHAPSODY) || defined(AUX)
+#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(RHAPSODY) || defined(AUX)
#undef HAVE_LCHOWN
#endif
@@ -55,11 +55,11 @@
#define GETCWD_CAN_MALLOC
#endif
-#ifdef linux
+#ifdef LINUX
#include <getopt.h>
#endif
-#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC)
+#if defined(SCO) || defined(UNIXWARE) || defined(SNI) || defined(NCR) || defined(NEC) || defined(AUX)
#if !defined(S_ISLNK) && defined(S_IFLNK)
#define S_ISLNK(a) (((a) & S_IFMT) == S_IFLNK)
#endif
1.2 +1 -0 apache-2.0/nsprpub/pr/include/md/_aux.h
Index: _aux.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/include/md/_aux.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- _aux.h 1998/09/23 01:18:30 1.1
+++ _aux.h 1998/09/23 18:50:23 1.2
@@ -33,6 +33,7 @@
#undef HAVE_DLL
#undef USE_DLFCN
+#define PR_DLL_SUFFIX ""
#define _PR_RECV_BROKEN /* recv doesn't work on Unix Domain Sockets */
#if !defined (HAVE_STRERROR)
1.2 +4 -4 apache-2.0/nsprpub/pr/src/io/prfile.c
Index: prfile.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/io/prfile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prfile.c 1998/06/30 08:36:30 1.1
+++ prfile.c 1998/09/23 18:50:23 1.2
@@ -266,7 +266,7 @@
PRInt32 PR_GetSysfdTableMax(void)
{
-#if defined(XP_UNIX) && !defined(AIX)
+#if defined(XP_UNIX) && !defined(AIX) && !defined(AUX)
struct rlimit rlim;
if ( getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
@@ -275,7 +275,7 @@
}
return rlim.rlim_max;
-#elif defined(AIX)
+#elif defined(AIX) || defined(AUX)
return sysconf(_SC_OPEN_MAX);
#elif defined(WIN32) || defined(OS2)
/*
@@ -295,7 +295,7 @@
PRInt32 PR_SetSysfdTableSize(int table_size)
{
-#if defined(XP_UNIX) && !defined(AIX)
+#if defined(XP_UNIX) && !defined(AIX) && !defined(AUX)
struct rlimit rlim;
PRInt32 tableMax = PR_GetSysfdTableMax();
@@ -319,7 +319,7 @@
}
return rlim.rlim_cur;
-#elif defined(AIX) || defined(WIN32) || defined(WIN16) || defined(OS2)
+#elif defined(AIX) || defined(WIN32) || defined(WIN16) || defined(OS2) || defined(AUX)
PR_SetError(PR_NOT_IMPLEMENTED_ERROR, 0);
return -1;
#elif defined (XP_MAC)
1.2 +2 -0 apache-2.0/nsprpub/pr/src/malloc/prmalloc.c
Index: prmalloc.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/malloc/prmalloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prmalloc.c 1998/06/30 08:36:31 1.1
+++ prmalloc.c 1998/09/23 18:50:24 1.2
@@ -88,7 +88,9 @@
#include <string.h>
#include <errno.h>
#include <sys/types.h>
+#if !defined(AUX)
#include <sys/mman.h>
+#endif
#endif
/*
1.2 +1 -1 apache-2.0/nsprpub/pr/src/md/prosdep.c
Index: prosdep.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/md/prosdep.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prosdep.c 1998/06/30 08:36:31 1.1
+++ prosdep.c 1998/09/23 18:50:25 1.2
@@ -42,7 +42,7 @@
/* Get page size */
#ifdef XP_UNIX
#if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \
- || defined FREEBSD || defined RHAPSODY
+ || defined FREEBSD || defined NETBSD || defined RHAPSODY || defined AUX
_pr_pageSize = getpagesize();
#elif defined(HPUX)
/* I have no idea. Don't get me started. --Rob */
1.2 +5 -1 apache-2.0/nsprpub/pr/src/md/unix/unix.c
Index: unix.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/nsprpub/pr/src/md/unix/unix.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unix.c 1998/06/30 08:36:31 1.1
+++ unix.c 1998/09/23 18:50:25 1.2
@@ -26,7 +26,9 @@
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/ioctl.h>
+#if !defined(AUX)
#include <sys/mman.h>
+#endif
#ifdef _PR_POLL_AVAILABLE
#include <poll.h>
@@ -48,7 +50,7 @@
|| defined(SUNOS4) || defined(NCR) || defined(RHAPSODY)
#define _PRSockLen_t int
#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
- || defined(UNIXWARE)
+ || defined(NETBSD) || defined(UNIXWARE) || defined(DGUX) || defined(AUX)
#define _PRSockLen_t size_t
#else
#error "Cannot determine architecture"
@@ -2539,7 +2541,9 @@
vtact.sa_handler = (void (*)()) ClockInterruptHandler;
sigemptyset(&vtact.sa_mask);
+#if !defined(AUX)
vtact.sa_flags = SA_RESTART;
+#endif
sigaction(SIGALRM, &vtact, 0);
#endif /* HPUX9 */