cvs: php4 /ext/standard array.c /main mergesort.c php.h

sas Thu Nov 2 07:32:53 2000 EDT Modified files: /php4/main php.h mergesort.c /php4/ext/standard array.c Log: Namespace protect mergesort (caused conflict on Darwin). Index: php4/main/php.h diff -u php4/main/php.h:1.125 php4/main/php.h:1.126 --- php4/main/php.h:1.125 Thu Sep 7 08:20:29 2000 +++ php4/main/php.h Thu Nov 2 07:32:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.125 2000/09/07 15:20:29 andi Exp $ */ +/* $Id: php.h,v 1.126 2000/11/02 15:32:52 sas Exp $ */ #ifndef PHP_H #define PHP_H @@ -272,7 +272,7 @@ int php_global_startup_internal_extensions(void); int php_global_shutdown_internal_extensions(void); -int mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *)); +int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *)); PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata); Index: php4/main/mergesort.c diff -u php4/main/mergesort.c:1.6 php4/main/mergesort.c:1.7 --- php4/main/mergesort.c:1.6 Fri Feb 11 07:59:26 2000 +++ php4/main/mergesort.c Thu Nov 2 07:32:52 2000 @@ -100,7 +100,7 @@ /* * Arguments are as for qsort. */ -int mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void *)) +int php_mergesort(void *base, size_t nmemb, size_t size, int (*cmp)(const void *, const void *)) { register unsigned int i; register int sense; Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.80 php4/ext/standard/array.c:1.81 --- php4/ext/standard/array.c:1.80 Fri Oct 27 07:08:33 2000 +++ php4/ext/standard/array.c Thu Nov 2 07:32:52 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.80 2000/10/27 14:08:33 andrei Exp $ */ +/* $Id: array.c,v 1.81 2000/11/02 15:32:52 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -1379,7 +1379,7 @@ php_error(E_WARNING, "Wrong datatype in shuffle() call"); RETURN_FALSE; } - if (zend_hash_sort((*array)->value.ht, (sort_func_t)mergesort, array_data_shuffle, 1) == FAILURE) { + if (zend_hash_sort((*array)->value.ht, (sort_func_t)php_mergesort, array_data_shuffle, 1) == FAILURE) { RETURN_FALSE; } RETURN_TRUE; @@ -2767,7 +2767,7 @@ } if (num_req_val == num_avail) { - if (zend_hash_sort(Z_ARRVAL_P(return_value), (sort_func_t)mergesort, array_data_shuffle, 1) == FAILURE) { + if (zend_hash_sort(Z_ARRVAL_P(return_value), (sort_func_t)php_mergesort, array_data_shuffle, 1) == FAILURE) { zval_dtor(return_value); RETURN_FALSE; }