From 30c1a2dde18d5349653e9ae7bc6b66e227c34cbd Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 13 Oct 2000 22:33:53 +0000
Subject: [PATCH] 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)

git-svn-id: svn://10.0.0.236/branches/NSS_3_1_BRANCH@81152 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/ckfw/ckapi.perl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mozilla/security/nss/lib/ckfw/ckapi.perl b/mozilla/security/nss/lib/ckfw/ckapi.perl
index 59c76197d7f..7837a184627 100644
--- a/mozilla/security/nss/lib/ckfw/ckapi.perl
+++ b/mozilla/security/nss/lib/ckfw/ckapi.perl
@@ -31,7 +31,7 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-$cvs_id = '@(#) $RCSfile: ckapi.perl,v $ $Revision: 1.3 $ $Date: 2000-09-11 22:37:01 $ $Name: not supported by cvs2svn $';
+$cvs_id = '@(#) $RCSfile: ckapi.perl,v $ $Revision: 1.3.2.1 $ $Date: 2000-10-13 22:33:53 $ $Name: not supported by cvs2svn $';
 
 $copyright = '/* THIS IS A GENERATED FILE */
 /* 
@@ -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