diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-10-13 22:33:53 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-10-13 22:33:53 +0000 |
| commit | a481802e2eeae9f914415114da6e03f577362fbe (patch) | |
| tree | f1e025d88724c5c4db4612cec284044194541b72 | |
| parent | 81c729a1a1806e7307eb373209d92799aa606c2b (diff) | |
| download | nss-hg-a481802e2eeae9f914415114da6e03f577362fbe.tar.gz | |
Bugzilla bug #56442: struct CK_FUNCTION_LIST must have the pack pragma
on Windows. C_GetFunctionList must be DLL exported on Windows.
(NSS_3_1_BRANCH)
| -rw-r--r-- | security/nss/lib/ckfw/ckapi.perl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/security/nss/lib/ckfw/ckapi.perl b/security/nss/lib/ckfw/ckapi.perl index 565bf7ff0..baad8c52f 100644 --- a/security/nss/lib/ckfw/ckapi.perl +++ b/security/nss/lib/ckfw/ckapi.perl @@ -239,6 +239,8 @@ static const char NSSCKEPV_CVS_ID[] = "$g{CVS_ID} ; $cvs_id"; #include "nssckft.h" #endif /* NSSCKFT_H */ +#include "nssckp.h" + struct CK_FUNCTION_LIST { CK_VERSION version; EOD @@ -251,6 +253,8 @@ for( $j = 0; $j <= $count; $j++ ) { print <<EOD }; +#include "nsscku.h" + #endif /* NSSCKEPV_H */ EOD ; @@ -483,7 +487,11 @@ __ADJOIN(MODULE_NAME,C_GetFunctionList) } /* This one is always present */ +#ifdef WIN32 +CK_RV _declspec(dllexport) +#else CK_RV CK_ENTRY +#endif C_GetFunctionList ( CK_FUNCTION_LIST_PTR_PTR ppFunctionList |