summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKean Johnson <kean@armory.com>2005-11-08 06:33:33 +0000
committerKean Johnson <kean@armory.com>2005-11-08 06:33:33 +0000
commitaf24389ccccdf82a8224299f808acf07443ce98b (patch)
treed12958800e55985b5503977fadee21c72f791531
parent75cca7507a37ea2e65a7ff541560047b54da369e (diff)
See ChangeLog entry 2005-11-07 for details.XORG-6_8_99_903XORG-6_8_99_902
-rw-r--r--os/osdep.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/os/osdep.h b/os/osdep.h
index e8bd527..4b07b28 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -74,17 +74,16 @@ in this Software without prior written authorization from The Open Group.
#define OPEN_MAX 256
#else
#ifdef SVR4
-#ifdef SCO324
-#define OPEN_MAX sysconf(_SC_OPEN_MAX)
-#else
#define OPEN_MAX 128
-#endif
#else
#include <sys/param.h>
#ifdef __GNU__
#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
#endif /*__GNU__*/
#ifndef OPEN_MAX
+#ifdef SCO325
+#define OPEN_MAX (sysconf(_SC_OPEN_MAX))
+#else
#if defined(NOFILE) && !defined(NOFILES_MAX)
#define OPEN_MAX NOFILE
#else
@@ -94,8 +93,9 @@ in this Software without prior written authorization from The Open Group.
#endif
#endif
#endif
+#endif
-#ifdef __GNU__
+#if defined(__GNU__) || defined(SCO325)
#define MAXSOCKS 128
#else /*__GNU__*/
#if OPEN_MAX <= 128 /* 128 is value of MAXCLIENTS */