Fix building of applications using CRYPTOKI_GNU style

diff --git a/p11-kit/p11-kit.h b/p11-kit/p11-kit.h
index b8edcc2f4ef8d201751109bf25e745a8b60ae7e9..3c1b9fad6e617e3a4f2fca9b378ecf996644ef07 100644 (file)
--- a/p11-kit/p11-kit.h
+++ b/p11-kit/p11-kit.h
@@ -36,7 +36,6 @@
 #define __P11_KIT_H__
 
 #include "p11-kit/pkcs11.h"
-#include "deprecated.h"
 
 /*
  * If the caller is using the PKCS#11 GNU calling convention, then we cater
@@ -45,8 +44,11 @@
 #ifdef CRYPTOKI_GNU
 typedef ck_rv_t CK_RV;
 typedef struct ck_function_list* CK_FUNCTION_LIST_PTR;
+typedef struct ck_function_list CK_FUNCTION_LIST;
 #endif
 
+#include "p11-kit/deprecated.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif