[Libreoffice-commits] .: 2 commits - dtrans/source l10ntools/source rsc/source

[Tor Lillqvist]

 dtrans/source/win32/misc/ImplHelper.cxx    |    1 +
 dtrans/source/win32/mtaole/MtaOleClipb.cxx |    2 +-
 l10ntools/source/help/HelpCompiler.hxx     |    2 +-
 rsc/source/prj/start.cxx                   |    8 --------
 4 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 808fc3da04524582a7537902bebbd3d02c28ec14
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jun 22 09:08:02 2011 +0300

    Fix MinGW compilation

diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index f740e4c..d002741 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 a40ef2e..3dc560f 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 1fc08d2..606d711 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(); }
commit f7a7e908dbac3459f609ff7ce6337791cc01747b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jun 21 13:46:49 2011 +0300

    Drop unnecessary UNX vs. Windows ifdef
    
    The UNX code compiles fine both with MSVC and MinGW. In fact, the
    non-UNX code did not compile with a modern MinGW.

diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 6502041..3d0d15f 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -162,11 +162,7 @@ static sal_Bool CallPrePro( const ByteString& rPrePro,
         }
     }
 
-#if defined UNX
     nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
-#else
-    nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
-#endif
 
     if ( fRspFile )
         #if OSL_DEBUG_LEVEL > 5
@@ -260,11 +256,7 @@ static sal_Bool CallRsc2( ByteString aRsc2Name,
         printf( "\n" );
     }
 
-#if defined UNX
     nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
-#else
-    nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() );
-#endif
 
     if( fRspFile )
         #if OSL_DEBUG_LEVEL > 5