configure.ac | 4 +++-
openssl/ExternalProject_openssl.mk | 2 +-
sal/osl/w32/profile.cxx | 2 +-
solenv/gbuild/platform/com_MSC_class.mk | 8 +++++++-
solenv/gbuild/platform/com_MSC_defs.mk | 7 ++++++-
tools/inc/tools/stream.hxx | 3 ++-
tools/source/stream/strmwnt.cxx | 5 -----
7 files changed, 20 insertions(+), 11 deletions(-)
New commits:
commit 9477760a38416ef3e50781cc2821a3b1600a6d65
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 13:07:07 2013 +0200
Typo
Change-Id: I32c5bc1736305d38fb86b1b8af7606ac6c7f0dd0
diff --git a/openssl/ExternalProject_openssl.mk
b/openssl/ExternalProject_openssl.mk
index 891dd71..010d2ca 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -31,7 +31,7 @@ OPENSSL_PLATFORM := $(if $(filter LINUX FREEBSD
ANDROID,$(OS)),\
$(if $(filter GCC,$(COM)),\
mingw,\
$(if $(filter I,$(CPU)),\
- VC-WIN32,VC_WIN64A))))))
+ VC-WIN32,VC-WIN64A))))))
ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,openssl,build):
commit 9bd80d67de3d76ba89a4eed7c53cb9534a49dbc9
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 12:51:02 2013 +0200
The private SvFileStream::GetFileHandle() was used only on UNX
Drop the Windows implementation which wasn't x64-clean anyway.
Change-Id: I1622196dc4c3b940cc8d629016985cf97480a059
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index f157f90..25e2a732 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -659,8 +659,9 @@ private:
String aFilename;
sal_uInt16 nLockCounter;
sal_Bool bIsOpen;
+#ifdef UNX
sal_uInt32 GetFileHandle() const;
-
+#endif
// Forbidden and not implemented.
SvFileStream (const SvFileStream&);
SvFileStream & operator= (const SvFileStream&);
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 1d7dfb2..800dae1 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -133,11 +133,6 @@ SvFileStream::~SvFileStream()
delete pInstanceData;
}
-sal_uIntPtr SvFileStream::GetFileHandle() const
-{
- return (sal_uIntPtr)pInstanceData->hFile;
-}
-
sal_uInt16 SvFileStream::IsA() const
{
return ID_FILESTREAM;
commit 0e07da84299bb48dfc232c2888d176fa558ff58b
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 12:30:13 2013 +0200
Use BOOST_MEM_FN_ENABLE_CDECL only for x86
Change-Id: I3f752678f72260d5e481a71164a30cfc96807034
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 6027c94..2466422 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -55,10 +55,15 @@ gb_COMPILERDEFS := \
-D_CRT_SECURE_NO_DEPRECATE \
-D_MT \
-D_DLL \
- -DBOOST_MEM_FN_ENABLE_CDECL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-DM1500 \
+ifeq ($(CPUNAME),INTEL)
+gb_COMPILERDEFS += \
+ -DBOOST_MEM_FN_ENABLE_CDECL \
+
+endif
+
gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
commit 433672d1f4b9198fef362690b195f47822111e21
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 12:28:53 2013 +0200
Use subsystem version 5.02 on x64
Change-Id: I957cda779d300449e2110748a516c9662126f761
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 612342d..60855e4 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -173,6 +173,12 @@ cut -f 1001- -d ' ' $${RESPONSEFILE} >> $${RESPONSEFILE}.1
&& \
mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
endef
+ifeq ($(CPUNAME),X86_64)
+MSC_SUBSYSTEM_VERSION=$(COMMA)5.02
+else
+MSC_SUBSYSTEM_VERSION=$(COMMA)5.01
+endif
+
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(call gb_Helper_abbreviate_dirs,\
@@ -192,7 +198,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(COMMA)5.01,
-SUBSYSTEM:CONSOLE$(COMMA)5.01)) \
+ $(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION),
-SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), \
-LIBPATH:$(OUTDIR)/lib/x64 \
commit 7e056403f7986f09981bf69514548e143bbb94b7
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 10:51:00 2013 +0200
std::min() parameters must be of same type
Change-Id: If8ac23dcf2a9e5811c1b2fe84c92d78cdfbc825b
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 7477e3f..dd95669 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -1321,7 +1321,7 @@ static sal_Bool getLine(osl_TFile* pFile, const sal_Char
*pszLine, int MaxLen)
(pChr < (pFile->m_ReadBuf + sizeof(pFile->m_ReadBuf) - 1));
pChr++);
- Max = min(pChr - pFile->m_pReadPtr, MaxLen);
+ Max = min((int) (pChr - pFile->m_pReadPtr), MaxLen);
memcpy(pLine, pFile->m_pReadPtr, Max);
MaxLen -= Max;
pLine += Max;
commit 4dcef369040be95df4040737f7246c3fc588fd02
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Thu Mar 21 10:46:29 2013 +0200
Adapt to amd64/x64 terminology change
Change-Id: I9746559dcf001672906472bcdeaf49b9b20cd449
diff --git a/configure.ac b/configure.ac
index 75d64a3..eff4438 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4824,8 +4824,10 @@ find_msvc_dlls()
{
if test "$CPUNAME" = "INTEL"; then
vsarch=x86
- else
+ elif test $VCVER = 9; then
vsarch=amd64
+ else
+ vsarch=x64
fi
msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
