diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-25 17:28:54 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-10-25 17:28:54 +0000 |
| commit | 1f2c6877ad1fc8cb96937d56ea9ad097bfd43f02 (patch) | |
| tree | 054dfcf12dac9294819cff36094cd7ef9e96cb0d /pkcs11-helper-config.h | |
| parent | Removed #warn from ssl.c (diff) | |
| download | openvpn-1f2c6877ad1fc8cb96937d56ea9ad097bfd43f02.tar.xz | |
Merge with https://svn.openvpn.net/projects/openvpn/contrib/alon/BETA21@719
More PKCS#11 changes.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@720 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'pkcs11-helper-config.h')
| -rw-r--r-- | pkcs11-helper-config.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkcs11-helper-config.h b/pkcs11-helper-config.h index b8ea778..5cb6852 100644 --- a/pkcs11-helper-config.h +++ b/pkcs11-helper-config.h @@ -43,12 +43,6 @@ #ifdef PKCS11H_ENABLE_HELPER -#if defined(WIN32) -#include "cryptoki-win32.h" -#else -#include "cryptoki.h" -#endif - #include "error.h" #include "misc.h" #include "ssl.h" @@ -62,6 +56,8 @@ #define PKCS11_LOG_WARN M_WARN #define PKCS11_LOG_ERROR M_FATAL +#undef PKCS11_USE_CYGWIN + #if !defined(false) #define false 0 #endif @@ -81,5 +77,11 @@ #define PKCS11_PRM_OBJ_TYPE "--pkcs11-id-type" #define PKCS11_PRM_OBJ_ID "--pkcs11-id" +#if defined(WIN32) || defined(PKCS11_USE_CYGWIN) +#include "cryptoki-win32.h" +#else +#include "cryptoki.h" +#endif + #endif /* PKCS11H_ENABLE_HELPER */ #endif /* __PKCS11_HELPER_CONFIG_H */ |