diff options
| author | tono <tono@openoffice.org> | 2011-03-22 22:20:11 +0900 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 14:52:07 +0000 |
| commit | 8004db554686f5bc54fca383362dab813ec4a442 (patch) | |
| tree | 79009c6228dc6501d8a0303de9ac1af0bb861c3e /sal | |
| parent | 3f00bc6717964c2d4db26093b64a68f93c7de906 (diff) | |
mingwport34: i#117493: mingw port of i109096
WCHAR is not compatible with sal_Unicode in mingw
Conflicts:
sal/osl/w32/module.cxx
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/module.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index bd680a89e979..ec261cfa3fbe 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -79,7 +79,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM //on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit) if (hInstance == NULL && Module->length > 260) { - std::vector<sal_Unicode> vec(Module->length + 1); + std::vector<WCHAR, rtl::Allocator<WCHAR> > vec(Module->length + 1); DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), reinterpret_cast<LPWSTR>(&vec[0]), Module->length + 1); if (len ) |