Bugzilla bug 111294: make NSS build on QNX6 (Neutrino). The patch was

contributed by Dave Inglis <dinglis@qnx.com>. r=wtc.
Modified Files:
	coreconf/config.mk coreconf/nsinstall/nsinstall.c
	nss/lib/freebl/unix_rand.c nss/lib/ssl/unix_err.c
Added Files:
	coreconf/QNX.mk

security/coreconf/QNX.mk

@@ -0,0 +1,68 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Netscape security libraries.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License Version 2 or later (the
+# "GPL"), in which case the provisions of the GPL are applicable 
+# instead of those above.  If you wish to allow use of your 
+# version of this file only under the terms of the GPL and not to
+# allow others to use your version of this file under the MPL,
+# indicate your decision by deleting the provisions above and
+# replace them with the notice and other provisions required by
+# the GPL.  If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+# Config stuff for QNX
+#
+
+include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+USE_PTHREADS = 1
+
+ifeq ($(USE_PTHREADS),1)
+	IMPL_STRATEGY = _PTH
+endif
+
+CC			= gcc
+CCC			= g++
+RANLIB			= ranlib
+
+DEFAULT_COMPILER = gcc
+ifeq ($(OS_TEST),ppc)
+	CPU_ARCH	= ppc
+else
+	CPU_ARCH	= x86
+endif
+
+MKSHLIB		= $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+ifdef BUILD_OPT
+	OPTIMIZER	= -O2
+endif
+
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -pipe -DNTO -DHAVE_STRERROR -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=500
+
+ifdef USE_PTHREADS
+	DEFINES		+= -D_REENTRANT
+endif
+
+DSO_CFLAGS		= -fPIC
+DSO_LDOPTS		= -shared
+DSO_LDFLAGS		=

security/coreconf/config.mk

@@ -56,7 +56,7 @@ include $(CORE_DEPTH)/coreconf/command.mk
 #       each OS release.                                              #
 #######################################################################
 
-ifeq (,$(filter-out FreeBSD BSD_OS NetBSD OS2,$(OS_TARGET)))
+ifeq (,$(filter-out FreeBSD BSD_OS NetBSD OS2 QNX,$(OS_TARGET)))
 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
 else
 include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk

security/coreconf/nsinstall/nsinstall.c

@@ -55,7 +55,7 @@ typedef unsigned int mode_t;
 
 #define HAVE_LCHOWN
 
-#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(VMS)
+#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(VMS) || defined(NTO)
 #undef HAVE_LCHOWN
 #endif
 

security/nss/lib/freebl/unix_rand.c

@@ -78,7 +78,7 @@ static size_t CopyLowBits(void *dst, size_t dstlen, void *src, size_t srclen)
 }
 
 #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
-    || defined(NETBSD)
+    || defined(NETBSD) || defined(NTO)
 #include <sys/times.h>
 
 #define getdtablesize() sysconf(_SC_OPEN_MAX)

security/nss/lib/ssl/unix_err.c

@@ -38,7 +38,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: unix_err.c,v 1.3 2001-03-13 19:02:05 relyea%netscape.com Exp $
+ * $Id: unix_err.c,v 1.4 2001-12-04 18:20:57 wtc%netscape.com Exp $
  */
 
 #if 0
@@ -48,7 +48,7 @@
 #include "prerror.h"
 #endif
 
-#if defined (__bsdi__)
+#if defined (__bsdi__) || defined(NTO)
 #undef _PR_POLL_AVAILABLE
 #endif
 
@@ -463,7 +463,12 @@ void nss_MD_unix_map_default_error(int err)
     case EADDRNOTAVAIL:	prError = PR_ADDRESS_NOT_AVAILABLE_ERROR; break;
     case EAFNOSUPPORT:	prError = PR_ADDRESS_NOT_SUPPORTED_ERROR; break;
     case EAGAIN:	prError = PR_WOULD_BLOCK_ERROR; break;
+    /*
+     * On QNX and Neutrino, EALREADY is defined as EBUSY.
+     */
+#if EALREADY != EBUSY
     case EALREADY:	prError = PR_ALREADY_INITIATED_ERROR; break;
+#endif
     case EBADF:		prError = PR_BAD_DESCRIPTOR_ERROR; break;
 #ifdef EBADMSG
     case EBADMSG:	prError = PR_IO_ERROR; break;