giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11: Avoid redefinition of ck_interface (#2243)

This commit is contained in:
Jakub Jelen 2021-03-01 09:35:21 +01:00 committed by Frank Morgner
parent 63031b2193
commit 60632100a0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pkcs11/pkcs11.h
View File

@ -876,11 +876,11 @@ typedef unsigned long ck_rv_t;
typedef ck_rv_t (*ck_notify_t) (ck_session_handle_t session, typedef ck_rv_t (*ck_notify_t) (ck_session_handle_t session,
ck_notification_t event, void *application); ck_notification_t event, void *application);
typedef struct ck_interface { struct ck_interface {
char * pInterfaceName; char * pInterfaceName;
void * pFunctionList; void * pFunctionList;
ck_flags_t flags; ck_flags_t flags;
} ck_interface; };
#define CKF_INTERFACE_FORK_SAFE (0x00000001UL) #define CKF_INTERFACE_FORK_SAFE (0x00000001UL)
@ -1169,12 +1169,12 @@ _CK_DECLARE_FUNCTION (C_GetFunctionStatus, (ck_session_handle_t session));
_CK_DECLARE_FUNCTION (C_CancelFunction, (ck_session_handle_t session)); _CK_DECLARE_FUNCTION (C_CancelFunction, (ck_session_handle_t session));
_CK_DECLARE_FUNCTION (C_GetInterfaceList, _CK_DECLARE_FUNCTION (C_GetInterfaceList,
(ck_interface *interfaces_list, (struct ck_interface *interfaces_list,
unsigned long *count)); unsigned long *count));
_CK_DECLARE_FUNCTION (C_GetInterface, _CK_DECLARE_FUNCTION (C_GetInterface,
(unsigned char *interface_name, (unsigned char *interface_name,
struct ck_version *version, struct ck_version *version,
ck_interface **interface, struct ck_interface **interface,
ck_flags_t flags)); ck_flags_t flags));
_CK_DECLARE_FUNCTION (C_LoginUser, _CK_DECLARE_FUNCTION (C_LoginUser,