Diff

Differences From Artifact [67c147948d]:

To Artifact [3299bf8a7b]:


   219    219    * this should best be defined by
   220    220    *
   221    221    * #ifndef NULL_PTR
   222    222    * #define NULL_PTR 0
   223    223    * #endif
   224    224    */
   225    225   
          226  +#ifdef _WIN32
          227  +#pragma pack(push, cryptoki, 1)
          228  +#endif
   226    229   
   227    230   /* All the various Cryptoki types and #define'd values are in the
   228    231    * file pkcs11t.h. */
   229    232   #include "pkcs11t.h"
   230    233   
   231    234   #define __PASTE(x,y)      x##y
   232    235   
................................................................................
   285    288   
   286    289   /* Pile all the function pointers into the CK_FUNCTION_LIST. */
   287    290   /* pkcs11f.h has all the information about the Cryptoki
   288    291    * function prototypes. */
   289    292   #include "pkcs11f.h"
   290    293   
   291    294   };
          295  +
          296  +#ifdef _WIN32
          297  +#pragma pack(pop, cryptoki)
          298  +#endif
   292    299   
   293    300   #undef CK_PKCS11_FUNCTION_INFO
   294    301   
   295    302   
   296    303   #undef __PASTE
   297    304   
   298    305   #ifdef __cplusplus
   299    306   }
   300    307   #endif
   301    308   
   302    309   #endif