diff options
| author | tono <tono@openoffice.org> | 2011-03-22 22:20:11 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2011-03-22 22:20:11 +0900 |
| commit | f9ceb85dc952d9fe954f6865b85182ca892a802d (patch) | |
| tree | a7df14f3e61d2a625d6643bccd0b1de96ab5a017 /sal | |
| parent | a24842b43a687808376f69d4bdbb45fcddde73c4 (diff) | |
mingwport34: i#117493: mingw port of i109096 - WCHAR is not compatible with sal_Unicode in mingw
Diffstat (limited to 'sal')
| -rwxr-xr-x | sal/osl/w32/module.cxx | 2 | ||||
| -rwxr-xr-x | sal/osl/w32/procimpl.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index 65a17eb1352d..9adf6926f80d 100755 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -78,7 +78,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 nRtldMod //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit) if (hInstance == NULL && Module->length > 260) { - std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1); + std::vector<WCHAR, rtl::Allocator<WCHAR> > vec(Module->length + 1); DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), &vec[0], Module->length + 1); if (len ) diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index a2f86422df2a..164afe37b85b 100755 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -314,7 +314,7 @@ namespace /* private */ std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(path.getLength() + 1); //GetShortPathNameW only works if the file can be found! const DWORD len = GetShortPathNameW( - path.getStr(), &vec[0], path.getLength() + 1); + reinterpret_cast<LPCWSTR>(path.getStr()), reinterpret_cast<LPWSTR>(&vec[0]), path.getLength() + 1); if (!len && GetLastError() == ERROR_FILE_NOT_FOUND && extension.getLength()) @@ -323,7 +323,7 @@ namespace /* private */ std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec2( extPath.getLength() + 1); const DWORD len2 = GetShortPathNameW( - extPath.getStr(), &vec2[0], extPath.getLength() + 1); + reinterpret_cast<LPCWSTR>(extPath.getStr()), reinterpret_cast<LPWSTR>(&vec2[0]), extPath.getLength() + 1); ret = rtl::OUString(&vec2[0], len2); } else |