Addresses #59, ykcs11 still has issues on Win64.

2016-01-11 12:45:09 +01:00
parent 8d29845b51
commit 018821e99d
2 changed files with 16 additions and 4 deletions
@@ -239,6 +239,9 @@ extern "C" {

 #define __PASTE(x,y)      x##y

+#if defined _WIN32 || _WIN64
+#pragma pack(push, cryptoki, 1)
+#endif

 /* packing defines */
 //#include "pkcs11p.h" // TODO: msc specific?
@@ -309,6 +312,11 @@ struct CK_FUNCTION_LIST {
 /* unpack */
 //#include "pkcs11u.h" // TODO: msc specific?

+#if defined _WIN32 || _WIN64
+#pragma pack(pop, cryptoki)
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif