зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
57379e33fe
Коммит
586b10f4c5
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: hashops.c,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:50:13 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: hashops.c,v $ $Revision: 1.2 $ $Date: 2001/01/31 18:01:45 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
@ -45,7 +45,7 @@ static const char CVS_ID[] = "@(#) $RCSfile: hashops.c,v $ $Revision: 1.1 $ $Dat
|
|||
#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,
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: tracker.c,v $ $Revision: 1.2 $ $Date: 2001/01/03 19:48:49 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: tracker.c,v $ $Revision: 1.3 $ $Date: 2001/01/31 18:01:45 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
@ -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,
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
/*
|
||||
* certt.h - public data structures for the certificate library
|
||||
*
|
||||
* $Id: certt.h,v 1.5 2001/01/18 16:36:24 wtc%netscape.com Exp $
|
||||
* $Id: certt.h,v 1.6 2001/01/31 18:01:48 wtc%netscape.com Exp $
|
||||
*/
|
||||
#ifndef _CERTT_H_
|
||||
#define _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 */
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
*/
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: oid.c,v $ $Revision: 1.2 $ $Date: 2001/01/03 19:50:17 $ $Name: $";
|
||||
static const char CVS_ID[] = "@(#) $RCSfile: oid.c,v $ $Revision: 1.3 $ $Date: 2001/01/31 18:01:53 $ $Name: $";
|
||||
#endif /* DEBUG */
|
||||
|
||||
/*
|
||||
|
@ -282,7 +282,7 @@ static PZLock *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
|
||||
|
|
Загрузка…
Ссылка в новой задаче