Bugzilla bug 92085: checked in a Neutrino patch from

briane@qnx.com (Brian Edmond).  r=wtc.
Modified files: _nto.h protypes.h

nsprpub/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>

nsprpub/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;