diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-01-31 18:09:22 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-01-31 18:09:22 +0000 |
| commit | da34176d94b89fd7229412c30a85999d34dfe644 (patch) | |
| tree | 9fff3f97d593a42780e14bf88bca1e9261ec99fe | |
| parent | 6a68af3ce3c94e501b2a659a54f582facc9ed8d2 (diff) | |
| download | nss-hg-da34176d94b89fd7229412c30a85999d34dfe644.tar.gz | |
Bugzilla bug #67122: put PR_CALLBACK after the return type in function
declarations. This is the order required by OS/2 compilers. Thanks to
Javier Pedemonte <pedemont@us.ibm.com> for the patch.
Modified files: hashops.c, tracker.c, certt.h, oid.c.
(NSS_3_1_BRANCH)
| -rw-r--r-- | security/nss/lib/base/hashops.c | 8 | ||||
| -rw-r--r-- | security/nss/lib/base/tracker.c | 4 | ||||
| -rw-r--r-- | security/nss/lib/certdb/certt.h | 4 | ||||
| -rw-r--r-- | security/nss/lib/pki1/oid.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/security/nss/lib/base/hashops.c b/security/nss/lib/base/hashops.c index bd2de9a9c..1628f3797 100644 --- a/security/nss/lib/base/hashops.c +++ b/security/nss/lib/base/hashops.c @@ -45,7 +45,7 @@ static const char CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; #include "base.h" #endif /* BASE_H */ -static PR_CALLBACK void * +static void * PR_CALLBACK nss_arena_hash_alloc_table ( void *pool, @@ -65,7 +65,7 @@ nss_arena_hash_alloc_table return nss_ZAlloc(arena, size); } -static PR_CALLBACK void +static void PR_CALLBACK nss_arena_hash_free_table ( void *pool, @@ -75,7 +75,7 @@ nss_arena_hash_free_table (void)nss_ZFreeIf(item); } -static PR_CALLBACK PLHashEntry * +static PLHashEntry * PR_CALLBACK nss_arena_hash_alloc_entry ( void *pool, @@ -95,7 +95,7 @@ nss_arena_hash_alloc_entry return nss_ZNEW(arena, PLHashEntry); } -static PR_CALLBACK void +static void PR_CALLBACK nss_arena_hash_free_entry ( void *pool, diff --git a/security/nss/lib/base/tracker.c b/security/nss/lib/base/tracker.c index 00d499354..17a01a3f7 100644 --- a/security/nss/lib/base/tracker.c +++ b/security/nss/lib/base/tracker.c @@ -155,7 +155,7 @@ call_once * There are no possible errors. */ -static PR_CALLBACK PLHashNumber +static PLHashNumber PR_CALLBACK identity_hash ( const void *key @@ -245,7 +245,7 @@ nssPointerTracker_initialize * entries. */ -static PR_CALLBACK PRIntn +static PRIntn PR_CALLBACK count_entries ( PLHashEntry *he, diff --git a/security/nss/lib/certdb/certt.h b/security/nss/lib/certdb/certt.h index ffaaaca66..90d18aa3d 100644 --- a/security/nss/lib/certdb/certt.h +++ b/security/nss/lib/certdb/certt.h @@ -699,12 +699,12 @@ struct CERTOKDomainNameStr { }; -typedef SECStatus PR_CALLBACK (*CERTStatusChecker) (CERTCertDBHandle *handle, +typedef SECStatus (PR_CALLBACK *CERTStatusChecker) (CERTCertDBHandle *handle, CERTCertificate *cert, int64 time, void *pwArg); -typedef SECStatus PR_CALLBACK (*CERTStatusDestroy) (CERTStatusConfig *handle); +typedef SECStatus (PR_CALLBACK *CERTStatusDestroy) (CERTStatusConfig *handle); struct CERTStatusConfigStr { CERTStatusChecker statusChecker; /* NULL means no checking enabled */ diff --git a/security/nss/lib/pki1/oid.c b/security/nss/lib/pki1/oid.c index c4028a803..18b589234 100644 --- a/security/nss/lib/pki1/oid.c +++ b/security/nss/lib/pki1/oid.c @@ -282,7 +282,7 @@ static PRLock *oid_hash_lock; * inclined student. */ -static PR_CALLBACK PLHashNumber +static PLHashNumber PR_CALLBACK oid_hash ( const void *key @@ -310,7 +310,7 @@ oid_hash * but heck it's only used internally by the hash table anyway. */ -static PR_CALLBACK PRIntn +static PRIntn PR_CALLBACK oid_hash_compare ( const void *k1, @@ -407,7 +407,7 @@ static NSSArena *oid_arena; * It also creates the aforementioned NSSArena. */ -static PR_CALLBACK PRStatus +static PRStatus PR_CALLBACK oid_once_func ( void |