aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-05 20:50:23 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-05 20:50:23 +0000
commit725ebf7e5c4cb3f8fa4fab2dd7022df85a488034 (patch)
treed0a8832a591e442215d8c68e56d7b73e0fe42dce
parent920420da457a08cfe3cefea905f0d5bd8e0f8176 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.2@161421 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--astobj2.c2
-rw-r--r--include/asterisk/astobj2.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/astobj2.c b/astobj2.c
index 66c5a2cc3..1f33eec3f 100644
--- a/astobj2.c
+++ b/astobj2.c
@@ -294,7 +294,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 ? */
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index ca05141b5..8d83a8d23 100644
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -332,7 +332,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);
/*!
@@ -529,11 +529,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);