1 files changed, 13 insertions, 1 deletions
diff --git a/p11-kit/uri.h b/p11-kit/uri.h
index 1cf5c00..e19166d 100644
--- a/p11-kit/uri.h
+++ b/p11-kit/uri.h
@@ -50,6 +50,18 @@
 extern "C" {
 #endif
 
+/*
+ * If the caller is using the PKCS#11 GNU calling convention, then we cater
+ * to that here.
+ */
+#ifdef CRYPTOKI_GNU
+typedef struct ck_info *CK_INFO_PTR;
+typedef struct ck_token_info *CK_TOKEN_INFO_PTR;
+typedef ck_attribute_type_t CK_ATTRIBUTE_TYPE;
+typedef struct ck_attribute *CK_ATTRIBUTE_PTR;
+typedef unsigned long int CK_ULONG;
+#endif
+
 #define P11_KIT_URI_SCHEME "pkcs11:"
 #define P11_KIT_URI_SCHEME_LEN 7
 
@@ -70,7 +82,7 @@ typedef enum {
 	P11_KIT_URI_IS_ANY =     0x0000FFFF,
 } P11KitUriType;
 
-typedef struct _P11KitUri P11KitUri;
+typedef struct p11_kit_uri P11KitUri;
 
 CK_INFO_PTR         p11_kit_uri_get_module_info             (P11KitUri *uri);