From 09e7dc290c448c52a36894f811e21908cb5a6c50 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Dec 2015 16:58:39 +0100 Subject: [PATCH] Fix Cygwin build with wxUSE_STL==1 Use explicit c_str() when calling Cygwin functions taking char* or void* instead of relying on implicit conversions. --- src/msw/utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index a86dec2974..59873f6708 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -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