summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-10-17 22:28:29 +0000
committerwtc%netscape.com <devnull@localhost>2001-10-17 22:28:29 +0000
commitce4e3a3b2d1988771dd4cfc9d9ce871f7056c40c (patch)
tree8f684cdca4a49b1ddd087f73e53b80f528cd5d21
parent01365b5faaa5ea3111d42b830c759454f55e36ca (diff)
downloadnspr-hg-ce4e3a3b2d1988771dd4cfc9d9ce871f7056c40c.tar.gz
Bugzilla bug 92085: checked in a Neutrino patch from
briane@qnx.com (Brian Edmond). r=wtc. Modified files: _nto.h protypes.h
-rw-r--r--pr/include/md/_nto.h1
-rw-r--r--pr/include/obsolete/protypes.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/pr/include/md/_nto.h b/pr/include/md/_nto.h
index 4786251e..de6b8033 100644
--- a/pr/include/md/_nto.h
+++ b/pr/include/md/_nto.h
@@ -62,6 +62,7 @@
#define PR_HAVE_POSIX_NAMED_SHARED_MEMORY
#define _PR_HAVE_POSIX_SEMAPHORES
+#undef FD_SETSIZE
#define FD_SETSIZE 4096
#include <sys/time.h>
#include <sys/types.h>
diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h
index a569ff24..e96cfcf6 100644
--- a/pr/include/obsolete/protypes.h
+++ b/pr/include/obsolete/protypes.h
@@ -110,7 +110,7 @@ typedef PRUint64 uint64;
*/
#if !defined(XP_BEOS) && !defined(VMS)
-#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2)
+#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
typedef PRUint32 uint32;
#else
typedef unsigned long uint32;
@@ -150,7 +150,7 @@ typedef PRInt64 int64;
&& !defined(_PR_AIX_HAVE_BSD_INT_TYPES) \
&& !defined(HPUX)
#if !defined(WIN32) || !defined(_WINSOCK2API_) /* defines its own "int32" */
-#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2)
+#if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) && !defined(NTO)
typedef PRInt32 int32;
#else
typedef long int32;