From 9866d899e926c971980fd13ccaa9ab5e83f17b90 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Thu, 2 Nov 2000 15:32:52 +0000 Subject: Namespace protect mergesort (caused conflict on Darwin). --- main/php.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php.h') 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); -- cgit v1.2.1