diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:13:44 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:13:44 +0000 |
| commit | a3ab2658aa178c3c2ae492c0a3e45af5cfd48882 (patch) | |
| tree | a40d264b5126d76b8b19581fa44b434172416c54 /include | |
| parent | c6118ce23992d95243c21361b5793f91ec546c61 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@161428 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/astobj2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 322e4732c..344d15019 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); |