Commit 364242fc authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

ntdll: Rename mergesort to NTDLL_mergesort.

parent 9847d287
...@@ -254,14 +254,15 @@ double CDECL NTDLL_tan( double d ) ...@@ -254,14 +254,15 @@ double CDECL NTDLL_tan( double d )
/* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */ /* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */
static void mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), static void
int left, int right ) NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *),
int left, int right )
{ {
if(right>left) { if(right>left) {
int i, j, k, m; int i, j, k, m;
m=(right+left)/2; m=(right+left)/2;
mergesort( arr, barr, elemsize, compar, left, m); NTDLL_mergesort( arr, barr, elemsize, compar, left, m);
mergesort( arr, barr, elemsize, compar, m+1, right); NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);
#define X(a,i) ((char*)a+elemsize*(i)) #define X(a,i) ((char*)a+elemsize*(i))
for (i=m+1; i>left; i--) for (i=m+1; i>left; i--)
...@@ -290,6 +291,6 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, ...@@ -290,6 +291,6 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size,
int(__cdecl *compar)(const void *, const void *) ) int(__cdecl *compar)(const void *, const void *) )
{ {
void *secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); void *secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size);
mergesort( base, secondarr, size, compar, 0, nmemb-1 ); NTDLL_mergesort( base, secondarr, size, compar, 0, nmemb-1 );
RtlFreeHeap (GetProcessHeap(),0, secondarr); RtlFreeHeap (GetProcessHeap(),0, secondarr);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment