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/branches/1.4@161426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-12-05 21:02:20 +00:00
parent ca75782a96
commit ffc0c7e4ae
2 changed files with 4 additions and 4 deletions

View File

@@ -349,7 +349,7 @@ struct ao2_container;
*
* destructor is set implicitly.
*/
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);
/*!
@@ -546,11 +546,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;
};
struct ao2_iterator ao2_iterator_init(struct ao2_container *c, int flags);

View File

@@ -334,7 +334,7 @@ static int hash_zero(const void *user_obj, const int flags)
* A container is just an object, after all!
*/
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 ? */