Ticket #11626: 11626.txt

File 11626.txt, 1.7 KB (added by austin987, 11 years ago)

replace cygwin_conv_to_full_win32_path with cygwin_conv_path

Line 
1diff -ur /home/austin/downloads/wxWidgets-2.8.10/acinclude.m4 /home/austin/source/wxWidgets-2.8.10/acinclude.m4
2--- /home/austin/downloads/wxWidgets-2.8.10/acinclude.m4        2009-03-06 06:10:54.000000000 -0600
3+++ /home/austin/source/wxWidgets-2.8.10/acinclude.m4   2010-02-10 16:12:33.093750000 -0600
4@@ -549,6 +549,7 @@
5             dnl comma with the equal sign works) so
6             dnl simply disable it
7             wx_cv_version_script=no
8+                       AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
9             ;;
10 
11         *)
12diff -ur /home/austin/downloads/wxWidgets-2.8.10/src/msw/utils.cpp /home/austin/source/wxWidgets-2.8.10/src/msw/utils.cpp
13--- /home/austin/downloads/wxWidgets-2.8.10/src/msw/utils.cpp   2009-03-06 06:11:24.000000000 -0600
14+++ /home/austin/source/wxWidgets-2.8.10/src/msw/utils.cpp      2010-02-10 16:42:35.125000000 -0600
15@@ -67,7 +67,7 @@
16 #if defined(__CYGWIN__)
17     #include <sys/unistd.h>
18     #include <sys/stat.h>
19-    #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()
20+    #include <sys/cygwin.h> // for cygwin_conv_path()
21 #endif  //GNUWIN32
22 
23 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
24@@ -402,10 +402,10 @@
25       strDir << wxT('/');
26 
27     #ifdef __CYGWIN__
28-        // Cygwin returns unix type path but that does not work well
29-        static wxChar windowsPath[MAX_PATH];
30-        cygwin_conv_to_full_win32_path(strDir, windowsPath);
31-        strDir = windowsPath;
32+    // Cygwin returns unix type path but that does not work well
33+    static wxChar windowsPath[MAX_PATH];
34+    cygwin_conv_path (CCP_POSIX_TO_WIN_W, strDir, windowsPath, MAX_PATH);
35+    strDir = windowsPath;
36     #endif
37 #elif defined(__WXWINCE__)
38     strDir = wxT("\\");