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.2@161421 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/astobj2.c b/astobj2.c
index 66c5a2cc3250a938c14f8728d7cc9c4cba4e1cd1..1f33eec3fa7f175980f4c997dd1f670b168dca6a 100644 (file)
--- 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 ca05141b5fd647f312a02cd62c3fae7285132a76..8d83a8d23320d71af1efecea905b1794bbe44954 100644 (file)
--- 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);