summaryrefslogtreecommitdiff
path: root/main/php.h
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-11-02 15:32:52 +0000
committerSascha Schumann <sas@php.net>2000-11-02 15:32:52 +0000
commit9866d899e926c971980fd13ccaa9ab5e83f17b90 (patch)
tree6d44d6d8ef66ac003a33c97aed3fe55deac28c3e /main/php.h
parent3ac8e2581273d799b29a624907a37ade31e921da (diff)
downloadphp-git-9866d899e926c971980fd13ccaa9ab5e83f17b90.tar.gz
Namespace protect mergesort (caused conflict on Darwin).
Diffstat (limited to 'main/php.h')
-rw-r--r--main/php.h2
1 files changed, 1 insertions, 1 deletions
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);