[Libreoffice-commits] .: 3 commits - configure.in sal/inc ucb/source

[Jan Holesovsky]

 configure.in                     |    2 ++
 sal/inc/sal/types.h              |    4 ++++
 ucb/source/ucp/odma/odma_lib.cxx |    4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1b428599a3f9c2c1ddfad1fce101232ebc2b1fe5
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Sep 19 03:09:51 2011 +0200

    Fix build with MinGW.

diff --git a/ucb/source/ucp/odma/odma_lib.cxx b/ucb/source/ucp/odma/odma_lib.cxx
index 2272b23..97282f3 100644
--- a/ucb/source/ucp/odma/odma_lib.cxx
+++ b/ucb/source/ucp/odma/odma_lib.cxx
@@ -84,13 +84,15 @@ namespace odma
 
         ::rtl::OUString sPath;
     #ifdef WNT
+        OSL_ASSERT( sizeof( wchar_t ) == sizeof( sal_Unicode ) );
+
         wchar_t system32[MAX_PATH];
         UINT n = GetSystemDirectoryW( system32, MAX_PATH );
 
         if (n == 0)
             return sal_False;
 
-        sPath = ::rtl::OUString( system32, n ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\ODMA32.DLL"));
+        sPath = ::rtl::OUString( reinterpret_cast< const sal_Unicode* >( system32 ), n ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\ODMA32.DLL"));
 
     #endif
     #ifdef UNX
commit 9804e0ae666fc051f4ee05e4b19901ae4dd00fa0
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Sep 19 02:50:58 2011 +0200

    Add a clarifying comment (MinGW special case).

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index df2b963..f9725d6 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -150,6 +150,10 @@ typedef signed char              sal_sChar;
 typedef unsigned char            sal_uChar;
 
 #if ( defined(SAL_W32) && !defined(__MINGW32__) )
+    // http://msdn.microsoft.com/en-us/library/s3f49ktz%28v=vs.80%29.aspx
+    // "By default wchar_t is a typedef for unsigned short."
+    // But MinGW has a native wchar_t, and on many places, we cannot deal with
+    // that, so sal_Unicode has to be explicitly typedef'd as sal_uInt16 there.
     typedef wchar_t             sal_Unicode;
 #else
     #define SAL_UNICODE_NOTEQUAL_WCHAR_T
commit 77347b0bcedccff50b290ec5f5039bef1725ce5d
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Sep 19 01:48:38 2011 +0200

    Forward the num-cpus and max-jobs switches to the (cross) build configure.

diff --git a/configure.in b/configure.in
index fb9b028..16897b2 100755
--- a/configure.in
+++ b/configure.in
@@ -2119,6 +2119,8 @@ if test "$cross_compiling" = "yes"; then
         --disable-mozilla \
         --disable-build-mozilla \
         --disable-zenity \
+        --with-num-cpus="$with_num_cpus" \
+        --with-max-jobs="$with_max_jobs" \
         $sub_conf_opts \
         2>&1 | sed -e 's/^/    /'
     test -f ./Env.Host.sh 2>/dev/null || exit