Merged revisions 161426 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r161426 | seanbright | 2008-12-05 16:02:20 -0500 (Fri, 05 Dec 2008) | 15 lines Merged revisions 161421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r161421 | seanbright | 2008-12-05 15:50:23 -0500 (Fri, 05 Dec 2008) | 8 lines Fix build errors on FreeBSD (uint -> unsigned int). (closes issue #14006) Reported by: alphaque Patches: astobj2.h-patch uploaded by alphaque (license 259) (Slightly modified by seanbright) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@161427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
3eee1dbb9b
commit
fbb542055f
|
@ -685,9 +685,9 @@ struct ao2_container;
|
|||
#define ao2_t_container_alloc(arg1,arg2,arg3,arg4) _ao2_container_alloc((arg1), (arg2), (arg3))
|
||||
#define ao2_container_alloc(arg1,arg2,arg3) _ao2_container_alloc((arg1), (arg2), (arg3))
|
||||
#endif
|
||||
struct ao2_container *_ao2_container_alloc(const uint n_buckets,
|
||||
struct ao2_container *_ao2_container_alloc(const unsigned int n_buckets,
|
||||
ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn);
|
||||
struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets,
|
||||
struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets,
|
||||
ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn,
|
||||
char *tag, char *file, int line, const char *funcname);
|
||||
|
||||
|
@ -983,11 +983,11 @@ struct ao2_iterator {
|
|||
/*! current bucket */
|
||||
int bucket;
|
||||
/*! container version */
|
||||
uint c_version;
|
||||
unsigned int c_version;
|
||||
/*! pointer to the current object */
|
||||
void *obj;
|
||||
/*! container version when the object was created */
|
||||
uint version;
|
||||
unsigned int version;
|
||||
};
|
||||
|
||||
/* the flags field can contain F_AO2I_DONTLOCK, which will prevent
|
||||
|
|
|
@ -409,7 +409,7 @@ static int hash_zero(const void *user_obj, const int flags)
|
|||
/*
|
||||
* A container is just an object, after all!
|
||||
*/
|
||||
static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const uint n_buckets, ao2_hash_fn *hash_fn,
|
||||
static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const unsigned int n_buckets, ao2_hash_fn *hash_fn,
|
||||
ao2_callback_fn *cmp_fn)
|
||||
{
|
||||
/* XXX maybe consistency check on arguments ? */
|
||||
|
@ -430,7 +430,7 @@ static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, cons
|
|||
return c;
|
||||
}
|
||||
|
||||
struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_fn *hash_fn,
|
||||
struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets, ao2_hash_fn *hash_fn,
|
||||
ao2_callback_fn *cmp_fn, char *tag, char *file, int line, const char *funcname)
|
||||
{
|
||||
/* XXX maybe consistency check on arguments ? */
|
||||
|
@ -442,7 +442,7 @@ struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_
|
|||
}
|
||||
|
||||
struct ao2_container *
|
||||
_ao2_container_alloc(const uint n_buckets, ao2_hash_fn *hash_fn,
|
||||
_ao2_container_alloc(const unsigned int n_buckets, ao2_hash_fn *hash_fn,
|
||||
ao2_callback_fn *cmp_fn)
|
||||
{
|
||||
/* XXX maybe consistency check on arguments ? */
|
||||
|
|
Loading…
Reference in New Issue