summaryrefslogtreecommitdiff
path: root/main/mergesort.c
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/mergesort.c
parent3ac8e2581273d799b29a624907a37ade31e921da (diff)
downloadphp-git-9866d899e926c971980fd13ccaa9ab5e83f17b90.tar.gz
Namespace protect mergesort (caused conflict on Darwin).
Diffstat (limited to 'main/mergesort.c')
-rw-r--r--main/mergesort.c2
1 files changed, 1 insertions, 1 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;