Namespace protect mergesort (caused conflict on Darwin).

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 1478da640bb5d915cd4035feb1a875e6660ee79c..1a558a07fdc6d705ac5f490a700760e8e5642164 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1379,7 +1379,7 @@ PHP_FUNCTION(shuffle)
                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 @@ PHP_FUNCTION(array_rand)
        }  
 
        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;
                }

diff --git a/main/mergesort.c b/main/mergesort.c
index b173bc1269e845f4bef6beadce65d8a30d7818b0..c1eb8bc26e25f864ed9b02f8e14ed6d00bccea72 100644 (file)
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -100,7 +100,7 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
 /*
  * 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;

diff --git a/main/php.h b/main/php.h
index 54d2e6ed4055d95c070b557b851c078a403ac241..b4b90ba6b7cee6e515ecda0e1a5dd891ac71d9eb 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -272,7 +272,7 @@ int php_startup_internal_extensions(void);
 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);