[asterisk-commits] seanbright: branch 1.6.1 r161429 - in /branches/1.6.1: ./ include/asterisk/ m...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri Dec  5 15:16:15 2008
New Revision: 161429

URL: http://svn.digium.com/view/asterisk?view=rev&rev=161429
Log:
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)
    ........
  ................
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/astobj2.h
    branches/1.6.1/main/astobj2.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/astobj2.h?view=diff&rev=161429&r1=161428&r2=161429
==============================================================================
--- branches/1.6.1/include/asterisk/astobj2.h (original)
+++ branches/1.6.1/include/asterisk/astobj2.h Fri Dec  5 15:16:15 2008
@@ -673,9 +673,9 @@
 #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 @@
 	/*! 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 

Modified: branches/1.6.1/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/astobj2.c?view=diff&rev=161429&r1=161428&r2=161429
==============================================================================
--- branches/1.6.1/main/astobj2.c (original)
+++ branches/1.6.1/main/astobj2.c Fri Dec  5 15:16:15 2008
@@ -404,7 +404,7 @@
 /*
  * A container is just an object, after all!
  */
-static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const uint n_buckets, ao2_hash_fn *hash_fn,
+static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, const unsigned int n_buckets, ao2_hash_fn *hash_fn,
 											ao2_callback_fn *cmp_fn)
 {
 	/* XXX maybe consistency check on arguments ? */
@@ -425,7 +425,7 @@
 	return c;
 }
 
-struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_fn *hash_fn,
+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)
 {
 	/* XXX maybe consistency check on arguments ? */
@@ -437,7 +437,7 @@
 }
 
 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 ? */