From 6f1e963901ca7aff7af6bec376af00f892cbb9ca Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Mon, 30 May 2011 14:17:44 +0200 Subject: GNU style definitions in uri.h as well as normal. --- p11-kit/uri.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/p11-kit/uri.h b/p11-kit/uri.h index 2c8d2d8..ceb1f4b 100644 --- a/p11-kit/uri.h +++ b/p11-kit/uri.h @@ -50,18 +50,6 @@ 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 @@ -92,6 +80,20 @@ typedef enum { P11_KIT_URI_FOR_ANY = 0x0000FFFF, } P11KitUriType; +/* + * 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; +typedef P11KitUriType p11_kit_uri_type_t; +typedef P11KitUriResult p11_kit_uri_result_t; +#endif + typedef struct p11_kit_uri P11KitUri; CK_INFO_PTR p11_kit_uri_get_module_info (P11KitUri *uri); -- cgit v1.1