Module: wine Branch: master Commit: 364242fcf301ecb255cb0f8abe4d0d468d50c2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=364242fcf301ecb255cb0f8abe...
Author: Marcus Meissner marcus@jet.franken.de Date: Wed May 12 07:53:39 2010 +0200
ntdll: Rename mergesort to NTDLL_mergesort.
---
dlls/ntdll/misc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index d09ceef..01e9ab6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -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 */ -static void mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), - int left, int right ) +static void +NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), + int left, int right ) { if(right>left) { int i, j, k, m; m=(right+left)/2; - mergesort( arr, barr, elemsize, compar, left, m); - mergesort( arr, barr, elemsize, compar, m+1, right); + NTDLL_mergesort( arr, barr, elemsize, compar, left, m); + NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);
#define X(a,i) ((char*)a+elemsize*(i)) for (i=m+1; i>left; i--) @@ -290,6 +291,6 @@ void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, int(__cdecl *compar)(const void *, const void *) ) { 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); }