diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:02:20 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:02:20 +0000 |
| commit | d50076f797cb94ac1d44bcb16b64206511e4cd17 (patch) | |
| tree | 2bfecb87344bdbbe1d5b103bf847e4478993f986 /include/asterisk | |
| parent | e1af0b32e84b28d190d7addbb4d61fc2578802a3 (diff) | |
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.4@161426 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -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 1374e2965..dd154ec85 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -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); |