[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/os_stu...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/08 11:02:08

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : os_stubs.h stubs_c.c 

Log message:
        patch #5626

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1137&r2=1.1138
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/os_stubs.h?cvsroot=mldonkey&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/stubs_c.c?cvsroot=mldonkey&r1=1.42&r2=1.43

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1137
retrieving revision 1.1138
diff -u -b -r1.1137 -r1.1138
--- distrib/ChangeLog   6 Jan 2007 18:18:08 -0000       1.1137
+++ distrib/ChangeLog   8 Jan 2007 11:02:08 -0000       1.1138
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2007/01/08
+5626: MinGW: fix missing declarations and wrong pointer
+      initialization in stubs_c.c (Schlumpf)
+
 2007/01/06
 5599: EDK: Support for files >4GB (TripleM, pango)
 5660: Swarming: Enable wrongly disabled select block memoization (pango)

Index: src/utils/lib/os_stubs.h
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/os_stubs.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/utils/lib/os_stubs.h    5 Sep 2006 14:19:10 -0000       1.16
+++ src/utils/lib/os_stubs.h    8 Jan 2007 11:02:08 -0000       1.17
@@ -34,6 +34,7 @@
 typedef SOCKET OS_SOCKET;
 typedef unsigned int uint;
 extern void win32_maperr(unsigned long errcode);
+unsigned char * utf8_to_utf16(const char * str);
 
 /*******************************************************************
 

Index: src/utils/lib/stubs_c.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/stubs_c.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/utils/lib/stubs_c.c     15 Aug 2006 11:32:51 -0000      1.42
+++ src/utils/lib/stubs_c.c     8 Jan 2007 11:02:08 -0000       1.43
@@ -954,7 +954,7 @@
     FARPROC f;
     int retval = 0;
     WCHAR tmp [MAX_PATH], resolved_path [MAX_PATH];
-    WCHAR * wpath=utf8_to_utf16(path);
+    WCHAR * wpath = (WCHAR *)utf8_to_utf16(path);
     realpath(wpath, resolved_path);
     free(wpath);
     if (!resolved_path)