Stefan Oberhumer : ntdll: Fix 64 bit issue within NTDLL_mergesort().

Alexandre Julliard julliard at winehq.org
Mon Oct 4 11:04:00 CDT 2010


Module: wine
Branch: master
Commit: 98134a8c5a3a641d31156828297a1d9e5fb31be1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=98134a8c5a3a641d31156828297a1d9e5fb31be1

Author: Stefan Oberhumer <stefan at obssys.com>
Date:   Sat Oct  2 00:31:03 2010 +0200

ntdll: Fix 64 bit issue within NTDLL_mergesort().

---

 dlls/ntdll/misc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 2d7c0a7..39b0ad3 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -255,11 +255,11 @@ 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
-NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *),
-                 int left, int right )
+NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *),
+                 size_t left, size_t right )
 {
     if(right>left) {
-        int i, j, k, m;
+        size_t i, j, k, m;
         m=(right+left)/2;
         NTDLL_mergesort( arr, barr, elemsize, compar, left, m);
         NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right);




More information about the wine-cvs mailing list