diff options
| -rw-r--r-- | sal/osl/w32/makefile.mk (renamed from sal/osl/w32/MAKEFILE.MK) | 0 | ||||
| -rw-r--r-- | sal/osl/w32/module.cxx | 12 | ||||
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/w32/signal.cxx | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/makefile.mk index 08e8745a9dcd..08e8745a9dcd 100644 --- a/sal/osl/w32/MAKEFILE.MK +++ b/sal/osl/w32/makefile.mk diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx index 70d4fa38a6ef..842d40159f0e 100644 --- a/sal/osl/w32/module.cxx +++ b/sal/osl/w32/module.cxx @@ -26,7 +26,13 @@ * ************************************************************************/ +#ifdef __MINGW32__ +extern "C" { +#endif #include "system.h" +#ifdef __MINGW32__ +} +#endif #include <tlhelp32.h> #include "file_url.h" @@ -81,13 +87,13 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName, sal_Int32 /*nRtldM { std::vector<sal_Unicode, rtl::Allocator<sal_Unicode> > vec(Module->length + 1); DWORD len = GetShortPathNameW(reinterpret_cast<LPCWSTR>(Module->buffer), - &vec[0], Module->length + 1); + reinterpret_cast<LPWSTR>(&vec[0]), Module->length + 1); if (len ) { - hInstance = LoadLibraryW(&vec[0]); + hInstance = LoadLibraryW(reinterpret_cast<LPWSTR>(&vec[0])); if (hInstance == NULL) - hInstance = LoadLibraryExW(&vec[0], NULL, + hInstance = LoadLibraryExW(reinterpret_cast<LPWSTR>(&vec[0]), NULL, LOAD_WITH_ALTERED_SEARCH_PATH); } } diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 54d5f912d0e2..7ef6fb62ad8c 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -315,7 +315,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()) @@ -324,7 +324,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 diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx index de2201f8d8a6..659d66ee1c74 100644 --- a/sal/osl/w32/signal.cxx +++ b/sal/osl/w32/signal.cxx @@ -39,7 +39,7 @@ #ifndef __MINGW32__ #include <DbgHelp.h> #endif -#include <ErrorRep.h> +#include <errorrep.h> #include <systools/win32/uwinapi.h> #include <sal/macros.h> |