kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 161427 via svnmerge from

Browse Source 
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
This commit is contained in:
Sean Bright
2008-12-05 21:13:44 +00:00
parent 2e732411d4
commit d9c4ba0231
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/astobj2.h
View File

@@ -356,7 +356,7 @@ struct ao2_container;
* *
* destructor is set implicitly. * 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); ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn);
/*! \brief /*! \brief
@@ -565,11 +565,11 @@ struct ao2_iterator {
/*! current bucket */ /*! current bucket */
int bucket; int bucket;
/*! container version */ /*! container version */
uint c_version; unsigned int c_version;
/*! pointer to the current object */ /*! pointer to the current object */
void *obj; void *obj;
/*! container version when the object was created */ /*! container version when the object was created */
uint version; unsigned int version;
}; };
struct ao2_iterator ao2_iterator_init(struct ao2_container *c, int flags); struct ao2_iterator ao2_iterator_init(struct ao2_container *c, int flags);

2
main/astobj2.c
View File

@@ -323,7 +323,7 @@ static int hash_zero(const void *user_obj, const int flags)
* A container is just an object, after all! * A container is just an object, after all!
*/ */
struct ao2_container * 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) ao2_callback_fn *cmp_fn)
{ {
/* XXX maybe consistency check on arguments ? */ /* XXX maybe consistency check on arguments ? */