Make libutil build for WinCE.

4 files changed, 23 insertions, 5 deletions

diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn
index 60ebb1fae..fc9a38094 100644
--- a/security/nss/lib/util/manifest.mn
+++ b/security/nss/lib/util/manifest.mn
@@ -59,8 +59,6 @@ EXPORTS = \
 	watcomfx.h \
 	$(NULL)
 
-MODULE = security
-
 CSRCS = \
 	secdig.c \
 	derdec.c \
@@ -86,6 +84,9 @@ CSRCS = \
 	utf8.c \
 	$(NULL)
 
-REQUIRES = security dbm
+MODULE = security
+
+# don't duplicate module name in REQUIRES
+REQUIRES = dbm
 
 LIBRARY_NAME = secutil
diff --git a/security/nss/lib/util/secder.h b/security/nss/lib/util/secder.h
index 3f957ab9c..fdd43b1de 100644
--- a/security/nss/lib/util/secder.h
+++ b/security/nss/lib/util/secder.h
@@ -41,7 +41,11 @@
  * $Id$
  */
 
+#if defined(_WIN32_WCE)
+#else
 #include <time.h>
+#endif
+
 #include "plarena.h"
 #include "prlong.h"
 
diff --git a/security/nss/lib/util/secport.c b/security/nss/lib/util/secport.c
index bfde55a81..727b141e5 100644
--- a/security/nss/lib/util/secport.c
+++ b/security/nss/lib/util/secport.c
@@ -258,6 +258,12 @@ PORT_FreeArena(PLArenaPool *arena, PRBool zero)
 	PZ_Lock(lock);
     }
     if (!pvd) {
+	/* Each of NSPR's DLLs has a function libVersionPoint().
+	** We could do a lot of extra work to be sure we're calling the
+	** one in the DLL that holds PR_FreeArenaPool, but instead we
+	** rely on the fact that ALL NSPR DLLs in the same directory
+	** must be from the same release, and we call which ever one we get. 
+	*/
 	/* no need for thread protection here */
 	pvd = libVersionPoint();
 	if ((pvd->vMajor > 4) || 
@@ -529,7 +535,7 @@ PORT_UCS2_ASCIIConversion(PRBool toUnicode, unsigned char *inBuf,
 int
 NSS_PutEnv(const char * envVarName, const char * envValue)
 {
-#if  defined(XP_MAC)
+#if  defined(XP_MAC) || defined(_WIN32_WCE)
     return SECFailure;
 #else
     SECStatus result = SECSuccess;
diff --git a/security/nss/lib/util/secport.h b/security/nss/lib/util/secport.h
index c89c7dcd5..281b57ef6 100644
--- a/security/nss/lib/util/secport.h
+++ b/security/nss/lib/util/secport.h
@@ -85,7 +85,10 @@
 #include "watcomfx.h"
 #endif
 
-#ifdef XP_MAC
+#if defined(_WIN32_WCE)
+#include <windef.h>
+#include <types.h>
+#elif defined( XP_MAC ) 
 #include <types.h>
 #include <time.h> /* for time_t below */
 #else
@@ -100,7 +103,11 @@
 
 #include <ctype.h>
 #include <string.h>
+#if defined(_WIN32_WCE)
+#include <stdlib.h>	/* WinCE puts some stddef symbols here. */
+#else
 #include <stddef.h>
+#endif
 #include <stdlib.h>
 #include "prtypes.h"
 #include "prlog.h"	/* for PR_ASSERT */