Fix for 98068 - PR_CALLBACK OS/2 issues

This commit is contained in:
jpierre%netscape.com 2002-01-11 19:53:00 +00:00
Родитель 627abe4d47
Коммит 5bfd366791
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -154,9 +154,9 @@ int wrapMechanismCount = sizeof(wrapMechanismList)/sizeof(wrapMechanismList[0]);
static struct PK11GlobalStruct { static struct PK11GlobalStruct {
int transaction; int transaction;
PRBool inTransaction; PRBool inTransaction;
char *(*getPass)(PK11SlotInfo *,PRBool,void *); char *(PR_CALLBACK *getPass)(PK11SlotInfo *,PRBool,void *);
PRBool (*verifyPass)(PK11SlotInfo *,void *); PRBool (PR_CALLBACK *verifyPass)(PK11SlotInfo *,void *);
PRBool (*isLoggedIn)(PK11SlotInfo *,void *); PRBool (PR_CALLBACK *isLoggedIn)(PK11SlotInfo *,void *);
} PK11_Global = { 1, PR_FALSE, NULL, NULL, NULL }; } PK11_Global = { 1, PR_FALSE, NULL, NULL, NULL };
/************************************************************ /************************************************************

Просмотреть файл

@ -206,9 +206,9 @@ typedef enum {
/* function pointer type for password callback function. /* function pointer type for password callback function.
* This type is passed in to PK11_SetPasswordFunc() * This type is passed in to PK11_SetPasswordFunc()
*/ */
typedef char *(*PK11PasswordFunc)(PK11SlotInfo *slot, PRBool retry, void *arg); typedef char *(PR_CALLBACK *PK11PasswordFunc)(PK11SlotInfo *slot, PRBool retry, void *arg);
typedef PRBool (*PK11VerifyPasswordFunc)(PK11SlotInfo *slot, void *arg); typedef PRBool (PR_CALLBACK *PK11VerifyPasswordFunc)(PK11SlotInfo *slot, void *arg);
typedef PRBool (*PK11IsLoggedInFunc)(PK11SlotInfo *slot, void *arg); typedef PRBool (PR_CALLBACK *PK11IsLoggedInFunc)(PK11SlotInfo *slot, void *arg);
/* /*
* PKCS #11 key structures * PKCS #11 key structures