summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2002-05-24 21:25:00 +0000
committerwtc%netscape.com <devnull@localhost>2002-05-24 21:25:00 +0000
commit555923c14e55722a970ee371ea9640715ed5328f (patch)
tree85c585264016e6b46ada8fee87828995707c46f3
parentc62ef4406779b00b010cd95d51326bb02fe57fd0 (diff)
downloadnss-hg-555923c14e55722a970ee371ea9640715ed5328f.tar.gz
Merged a working fix for bug 142575 (in rev. 1.51) on the NSS_3_4_BRANCH.
-rw-r--r--security/nss/lib/nss/nssinit.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c
index 516b39827..775290f90 100644
--- a/security/nss/lib/nss/nssinit.c
+++ b/security/nss/lib/nss/nssinit.c
@@ -60,20 +60,8 @@
* in NSS 3.4. See bug 142575.
*/
#ifdef WIN32
-/*
- * Simulate how 'mktemp' was accidentally exported.
- *
- * The compiler warning message
- * warning C4273: 'mktemp' : inconsistent dll linkage. dllexport assumed.
- * is expected and should be ignored.
- */
-#include <io.h>
-
-char *
-mktemp(char *path)
-{
- return _mktemp(path);
-}
+/* Function forwarder to mktemp in softokn3 */
+#pragma comment(linker, "/export:mktemp=softokn3.mktemp")
#endif
#define NSS_MAX_FLAG_SIZE sizeof("readOnly")+sizeof("noCertDB")+ \