From 8e7a2796b98369382a006547b36c952c0cf8931e Mon Sep 17 00:00:00 2001 From: Klas Lindfors Date: Fri, 12 Aug 2016 15:09:49 +0200 Subject: [PATCH] if CRYPTOKI_EXPORTS is not defined don't add __declspec this messes up the windows build since we're already using libtool for the exports. --- ykcs11/pkcs11.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ykcs11/pkcs11.h b/ykcs11/pkcs11.h index 74b13c6..6a694ea 100644 --- a/ykcs11/pkcs11.h +++ b/ykcs11/pkcs11.h @@ -86,7 +86,13 @@ extern "C" { #ifdef CRYPTOKI_EXPORTS #define CK_SPEC __declspec(dllexport) #else -#define CK_SPEC __declspec(dllimport) +/* + * Yubico: we're using libtool to declare exports, this + * messes up the build. + * + * #define CK_SPEC __declspec(dllimport) + */ +#define CK_SPEC #endif #else