2006-12-17 Marcus Brinkmann <marcus@g10code.de>

	* src/pkcs11.h [__WIN32]: Changed to [_WIN32 ||
	CRYPTOKI_FORCE_WIN32] at the end.
	Submitted by Alon Bar-Lev.

ChangeLog

@@ -1,3 +1,9 @@
+2006-12-17  Marcus Brinkmann  <marcus@g10code.de>
+
+	* src/pkcs11.h [__WIN32]: Changed to [_WIN32 ||
+	CRYPTOKI_FORCE_WIN32] at the end.
+	Submitted by Alon Bar-Lev.
+
 2006-12-11  Marcus Brinkmann  <marcus@g10code.de>
 
 	* src/pkcs11.h (CKO_VENDOR_DEFINED): Fixed syntax error.

src/pkcs11.h

@@ -1321,7 +1321,7 @@ typedef struct ck_c_initialize_args *CK_C_INITIALIZE_ARGS_PTR;
 
 
 /* System dependencies.  */
-#ifdef __WIN32
+#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
 #pragma pack(pop, cryptoki)
 #endif