a number of windows build fixes

security/nss/lib/asn1/Makefile

@@ -30,11 +30,11 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2001-09-14 18:07:47 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2001-10-11 17:41:40 $ $Name:  $"
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export

security/nss/lib/asn1/config.mk

@@ -30,8 +30,19 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:56:21 $ $Name:  $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2001-10-11 17:41:40 $ $Name:  $"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG
 endif
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
+

security/nss/lib/dev/Makefile

@@ -30,11 +30,11 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2001-09-14 18:07:50 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2001-10-11 17:41:41 $ $Name:  $"
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export

security/nss/lib/dev/config.mk

@@ -30,8 +30,19 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2001-09-13 22:06:08 $ $Name:  $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2001-10-11 17:41:41 $ $Name:  $"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG
 endif
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
+

security/nss/lib/manifest.mn

@@ -35,6 +35,7 @@ DEPTH      = ../..
 
 DIRS =            \
 	base      \
+	asn1      \
 	dev       \
 	pki       \
 	pki1      \

security/nss/lib/pki/Makefile

@@ -30,11 +30,15 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2001-09-14 18:07:52 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2001-10-11 17:41:43 $ $Name:  $"
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+ifdef PURE_STAN_BUILD
+include config.mk
+else
+include config34.mk
+endif
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export

security/nss/lib/pki/config34.mk

@@ -0,0 +1,48 @@
+# 
+# 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) 1994-2000 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_CVS_ID = "@(#) $RCSfile: config34.mk,v $ $Revision: 1.1 $ $Date: 2001-10-11 17:41:43 $ $Name:  $"
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
+

security/nss/lib/pki/tdcache.c

@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: tdcache.c,v $ $Revision: 1.1 $ $Date: 2001-10-11 16:34:49 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: tdcache.c,v $ $Revision: 1.2 $ $Date: 2001-10-11 17:41:44 $ $Name:  $";
 #endif /* DEBUG */
 
 #ifndef PKIT_H
@@ -67,11 +67,13 @@ static NSSItem *
 get_issuer_and_serial_key(NSSArena *arena, NSSDER *issuer, NSSDER *serial)
 {
     NSSItem *rvKey;
+    PRUint8 *buf;
     rvKey = nss_ZNEW(arena, NSSItem);
     rvKey->data = nss_ZAlloc(arena, issuer->size + serial->size);
     rvKey->size = issuer->size + serial->size;
-    nsslibc_memcpy(rvKey->data, issuer->data, issuer->size);
-    nsslibc_memcpy(rvKey->data + issuer->size, serial->data, serial->size);
+    buf = (PRUint8 *)rvKey->data;
+    nsslibc_memcpy(buf, issuer->data, issuer->size);
+    nsslibc_memcpy(buf + issuer->size, serial->data, serial->size);
     return rvKey;
 }
 
@@ -254,9 +256,11 @@ nssTrustDomain_AddCertsToCache
 static NSSItem *
 get_static_ias(NSSItem *s_ias, NSSDER *issuer, NSSDER *serial)
 {
+    PRUint8 *buf;
     if (issuer->size + serial->size < s_ias->size) {
-	nsslibc_memcpy(s_ias->data, issuer->data, issuer->size);
-	nsslibc_memcpy(s_ias->data + issuer->size, serial->data, serial->size);
+	buf = (PRUint8 *)s_ias->data;
+	nsslibc_memcpy(buf, issuer->data, issuer->size);
+	nsslibc_memcpy(buf + issuer->size, serial->data, serial->size);
 	s_ias->size = issuer->size + serial->size;
 	return s_ias;
     } 

security/nss/lib/pki1/Makefile

@@ -30,11 +30,11 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.2 $ $Date: 2001-09-14 18:07:54 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2001-10-11 17:41:46 $ $Name:  $"
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+include config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 # Generate oiddata.h and oiddata.c.

security/nss/lib/pki1/config.mk

@@ -30,8 +30,18 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:16:16 $ $Name:  $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2001-10-11 17:41:47 $ $Name:  $"
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG
 endif
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =