Namespace protect mergesort (caused conflict on Darwin).

2 files changed, 2 insertions, 2 deletions

diff --git a/main/mergesort.c b/main/mergesort.c
index b173bc1269..c1eb8bc26e 100644
--- 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 54d2e6ed40..b4b90ba6b7 100644
--- 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);