mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	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/trunk@161427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -409,7 +409,7 @@ static int hash_zero(const void *user_obj, const int flags) | ||||
| /* | ||||
|  * 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 ? */ | ||||
| @@ -430,7 +430,7 @@ static struct ao2_container *__ao2_container_alloc(struct ao2_container *c, cons | ||||
| 	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 ? */ | ||||
| @@ -442,7 +442,7 @@ struct ao2_container *_ao2_container_alloc_debug(const uint n_buckets, ao2_hash_ | ||||
| } | ||||
|  | ||||
| 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 ? */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user