diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-05-24 23:46:27 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-05-24 23:46:27 +0000 |
| commit | 08ca1ea7f1978ec7e17b3812b6b21524565c0b36 (patch) | |
| tree | 30fe14e249ab76c2057c1398d2dc133dd3e00541 /security | |
| parent | 03fc9f3abbca05d414643e3bfbe9406be5509e36 (diff) | |
| download | nss-hg-08ca1ea7f1978ec7e17b3812b6b21524565c0b36.tar.gz | |
Merged a working fix for bug 142575 (in rev. 1.51) on the NSS_3_5_BRANCH.
Diffstat (limited to 'security')
| -rw-r--r-- | security/nss/lib/nss/nssinit.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/security/nss/lib/nss/nssinit.c b/security/nss/lib/nss/nssinit.c index 94333ab3e..c80b3324f 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")+ \ |