From d9c4ba0231d68c8b8a83ac6384ea67b49a6dfba5 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@malleable.com>
Date: Fri, 5 Dec 2008 21:13:44 +0000
Subject: [PATCH] Merged revisions 161427 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r161427 | seanbright | 2008-12-05 16:08:43 -0500 (Fri, 05 Dec 2008) | 22 lines

  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/branches/1.6.0@161428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 include/asterisk/astobj2.h | 6 +++---
 main/astobj2.c             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index 322e4732c6..344d150199 100644
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -356,7 +356,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);
 
 /*! \brief
@@ -565,11 +565,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);
diff --git a/main/astobj2.c b/main/astobj2.c
index 212b64ed9c..032a232b89 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -323,7 +323,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 ? */