summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-05-22 21:59:45 +0000
committerwtc%netscape.com <devnull@localhost>2001-05-22 21:59:45 +0000
commitc5b2c4a9041cafc5c5dd201809ab7a6b62084b65 (patch)
tree4c0db93e65ff1aa36ae2abac2d996a067f87d2a3
parent67dabbdcffb98b9d6d6bf2f09840ea03a404a7f4 (diff)
downloadnss-hg-c5b2c4a9041cafc5c5dd201809ab7a6b62084b65.tar.gz
Bugzilla bug #77199: more PR_CALLBACK changes received from Javier
Pedemonte <pedemont@us.ibm.com> for OS/2. Modified files: cert.h, certdb.h NSS_3_2_BRANCH
-rw-r--r--security/nss/lib/certdb/cert.h2
-rw-r--r--security/nss/lib/certdb/certdb.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 59b4031be..8a125d591 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -614,7 +614,7 @@ CERT_ImportCAChain (SECItem *certs, int numcerts, SECCertUsage certUsage);
** "f" is the callback function
** "arg" is the callback argument
*/
-typedef SECStatus (*CERTImportCertificateFunc)
+typedef SECStatus (PR_CALLBACK *CERTImportCertificateFunc)
(void *arg, SECItem **certs, int numcerts);
extern SECStatus
diff --git a/security/nss/lib/certdb/certdb.h b/security/nss/lib/certdb/certdb.h
index 51fef4118..cdb7cfff8 100644
--- a/security/nss/lib/certdb/certdb.h
+++ b/security/nss/lib/certdb/certdb.h
@@ -312,8 +312,8 @@ SECStatus SEC_OpenPermCertDB(CERTCertDBHandle *handle,
SECStatus SEC_DeletePermCertificate(CERTCertificate *cert);
-typedef SECStatus (* PermCertCallback)(CERTCertificate *cert, SECItem *k,
- void *pdata);
+typedef SECStatus (PR_CALLBACK * PermCertCallback)(CERTCertificate *cert,
+ SECItem *k, void *pdata);
/*
** Traverse the entire permanent database, and pass the certs off to a
** user supplied function.