diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-22 09:08:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-22 09:09:32 +0300 |
| commit | b1d08330f488ce079669d7f7255772469499ed8f (patch) | |
| tree | bdb6c95aa557c16f9e4f95dbca49630e837e7e07 | |
| parent | 1ad1d7c114931b3daf870fd8935463b92510787d (diff) | |
Fix MinGW compilation
| -rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 1 | ||||
| -rw-r--r-- | dtrans/source/win32/mtaole/MtaOleClipb.cxx | 2 | ||||
| -rw-r--r-- | l10ntools/source/help/HelpCompiler.hxx | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index c0db923d55d4..d2a79e3d0af8 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -47,6 +47,7 @@ #pragma warning(pop) #endif #ifdef __MINGW32__ +#include <setjmp.h> #include <excpt.h> #endif diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/dtrans/source/win32/mtaole/MtaOleClipb.cxx index ee6da2ee5628..89a41edb2300 100644 --- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx +++ b/dtrans/source/win32/mtaole/MtaOleClipb.cxx @@ -50,7 +50,7 @@ //#define UNICODE #include <osl/diagnose.h> -#include "..\..\inc\MtaOleClipb.hxx" +#include "../../inc/MtaOleClipb.hxx" #include <osl/conditn.hxx> #include <wchar.h> diff --git a/l10ntools/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx index d40c72547203..6642d571c67b 100644 --- a/l10ntools/source/help/HelpCompiler.hxx +++ b/l10ntools/source/help/HelpCompiler.hxx @@ -108,7 +108,7 @@ namespace fs { ::rtl::OUString ustrSystemPath; osl::File::getSystemPathFromFileURL(data, ustrSystemPath); - return ustrSystemPath.getStr(); + return (wchar_t const *) ustrSystemPath.getStr(); } #endif std::string native_directory_string() const { return native_file_string(); } |