[Libreoffice-commits] .: 2 commits - README.cross shell/inc

[Tor Lillqvist]

 README.cross                     |    4 ++++
 shell/inc/internal/utilities.hxx |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

New commits:
commit c477ad1858a35a81666debbce66e7fca68b01483
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 31 10:58:46 2011 +0300

    Work around compilation errors with mingw-w64 and --enable-debug

diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index 2697c80..3a410bf 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -44,8 +44,31 @@
 
 #include <string>
 #define STRSAFE_NO_DEPRECATE
+#ifdef __MINGW32__
+
+// Work around lack of strsafe library in mingw-w64, do let their
+// strsafe.h provide inlines of StringCchVPrintfA etc, avoid linking
+// errors in a debug build.
+#ifdef __CRT__NO_INLINE
+#undef __CRT__NO_INLINE
+#define DID_UNDEFINE__CRT__NO_INLINE
+#endif
+
+extern "C" {
+
+#endif
+
 #include <strsafe.h>
 
+#ifdef __MINGW32__
+}
+
+#ifdef DID_UNDEFINE__CRT__NO_INLINE
+#define __CRT__NO_INLINE
+#endif
+
+#endif
+
 //---------------------------------
 /** Convert a string to a wstring
     using CP_ACP
commit 5166d6ee7e7ab9709d3b4069c7bb828608ef0194
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 31 10:37:33 2011 +0300

    Minor update to the Windows autogen.lastrun sample to match mine

diff --git a/README.cross b/README.cross
index fe02e45..8241ea7 100644
--- a/README.cross
+++ b/README.cross
@@ -128,6 +128,7 @@ CXX_FOR_BUILD=ccache g++
 --build=x86_64-unknown-linux-gnu
 --host=i686-w64-mingw32
 --with-distro=LibreOfficeWin32
+--disable-activex
 --disable-binfilter
 --disable-build-mozilla
 --disable-directx
@@ -168,6 +169,9 @@ CXX_FOR_BUILD=ccache g++
 --with-system-openssl
 --with-system-redland
 --with-vendor=no
+--without-help
+--without-helppack-integration
+--without-myspell-dicts
 
 TODO: