diff options
| author | tono <tono@openoffice.org> | 2010-07-03 00:12:58 +0900 |
|---|---|---|
| committer | tono <tono@openoffice.org> | 2010-07-03 00:12:58 +0900 |
| commit | 360a6cc2dd034670da94e65b55a16cb01aadb7c0 (patch) | |
| tree | e0ea54488e78407d88a261a55e3a3c3473863a79 /basic/source/runtime | |
| parent | 56374a0df4ebb5a361589dc2d8c85cc94836371f (diff) | |
i#112777: DEV300_m84 MinGW basic/source/runtime build fail
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/dllmgr.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/wnt-mingw.s | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/runtime/dllmgr.cxx b/basic/source/runtime/dllmgr.cxx index bc08a8cb64..04f1ee0a8a 100644 --- a/basic/source/runtime/dllmgr.cxx +++ b/basic/source/runtime/dllmgr.cxx @@ -684,7 +684,7 @@ Dll * SbiDllMgr::Impl::getDll(rtl::OUString const & name) { Dlls::iterator i(dlls.find(name)); if (i == dlls.end()) { i = dlls.insert(Dlls::value_type(name, new Dll)).first; - HMODULE h = LoadLibraryW(name); + HMODULE h = LoadLibraryW(reinterpret_cast<LPCWSTR>(name.getStr())); if (h == 0) { dlls.erase(i); return 0; diff --git a/basic/source/runtime/wnt-mingw.s b/basic/source/runtime/wnt-mingw.s index 7868ddd386..8c332c1a8c 100644 --- a/basic/source/runtime/wnt-mingw.s +++ b/basic/source/runtime/wnt-mingw.s @@ -44,8 +44,8 @@ _DllMgr_callFp: shr ecx, 2 rep movsd $1: call DWORD PTR [ebp+8] - ; for extra safety, do not trust esp after call (in case the Basic Declare - ; signature is wrong): + # for extra safety, do not trust esp after call (in case the Basic Declare + # signature is wrong): mov edi, [ebp-8] mov esi, [ebp-4] mov esp, ebp |