Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Cygwin build with wxUSE_STL==1

Browse Source 
Use explicit c_str() when calling Cygwin functions taking char* or void*
instead of relying on implicit conversions.
This commit is contained in:
Vadim Zeitlin
2015-12-02 16:58:39 +01:00
parent d0dc318b9d
commit 09e7dc290c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/utils.cpp
View File

@@ -351,9 +351,9 @@ const wxChar* wxGetHomeDir(wxString *pstr)
// Cygwin returns unix type path but that does not work well
static wxChar windowsPath[MAX_PATH];
#if CYGWIN_VERSION_DLL_MAJOR >= 1007
cygwin_conv_path(CCP_POSIX_TO_WIN_W, strDir, windowsPath, MAX_PATH);
cygwin_conv_path(CCP_POSIX_TO_WIN_W, strDir.c_str(), windowsPath, MAX_PATH);
#else
cygwin_conv_to_full_win32_path(strDir, windowsPath);
cygwin_conv_to_full_win32_path(strDir.c_str(), windowsPath);
#endif
strDir = windowsPath;
#endif