diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:16:15 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-05 21:16:15 +0000 |
| commit | b5eafe5d519a36a2fd240f8970e524c17a49e770 (patch) | |
| tree | c67f81e5d1597e44e9efb6ad6b9a70704ab86749 /include | |
| parent | a7f4ea1bdc01a55cd8e82141edc88590962ad853 (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.1@161429 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/astobj2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h index 542de44e0..3f5f5347b 100644 --- a/include/asterisk/astobj2.h +++ b/include/asterisk/astobj2.h @@ -673,9 +673,9 @@ struct ao2_container; #define ao2_t_container_alloc(arg1,arg2,arg3,arg4) _ao2_container_alloc((arg1), (arg2), (arg3)) #define ao2_container_alloc(arg1,arg2,arg3) _ao2_container_alloc((arg1), (arg2), (arg3)) #endif -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); -struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, +struct ao2_container *_ao2_container_alloc_debug(const unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn, char *tag, char *file, int line, const char *funcname); @@ -942,11 +942,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; }; /* the flags field can contain F_AO2I_DONTLOCK, which will prevent |