[Libreoffice-commits] core.git: 2 commits - firebird/ExternalProject_firebird.mk svl/source

[Fridrich Å trba]

 firebird/ExternalProject_firebird.mk  |    2 +-
 svl/source/config/languageoptions.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6c2c7014809b0f74c922833220de4ccc723defc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 17 13:04:50 2013 +0200

    Fix MINGW64 build in svl
    
    Change-Id: I92370c829c192be4ae480e13f290629e7a85be0c

diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 8d09427..7184ea1 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -208,7 +208,7 @@ bool SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptTyp
 
             for(int i = 0; i < nLayouts; ++i)
             {
-                LCID lang = MAKELCID(((UINT)lpList[i] & 0xffffffff), SORT_DEFAULT);
+                LCID lang = MAKELCID(((WORD)(DWORD_PTR)lpList[i] & 0xffff), SORT_DEFAULT);
                 if (MsLangId::getScriptType(lang) == scriptType)
                 {
                     isInstalled = true;
commit 651ef78f6c02fbfc03e672104f27203ec29fe483
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 17 13:00:47 2013 +0200

    cygpath only on WNTMSC
    
    Change-Id: I38a52116e0bcd85d34c153880c281087bcd2cb41

diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk
index b0f639c..5595498 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 				-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
 		&& export LD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
 		&& export DYLD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \
-		$(if $(filter WNT,$(OS)), && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \
+		$(if $(filter WNT-MSC,$(OS)-$(COM)), && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \
 		&& ./configure \
 			--without-editline \
 			--disable-superserver \