[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - icc/makefile.mk icc/SampleICC-1.3.2-Win64.patch salhelper/source

[Damjan Jovanovic]

 icc/SampleICC-1.3.2-Win64.patch |   11 +++++++
 icc/makefile.mk                 |    2 -
 salhelper/source/makefile.mk    |    2 +
 salhelper/source/mscx.map       |   58 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)

New commits:
commit 4fd38c7a96b91bdce3804a490e6f4b643000c212
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Mar 7 04:37:48 2018 +0000

    Patch main/icc to build on Win64.
    
    Patch by: me

diff --git a/icc/SampleICC-1.3.2-Win64.patch b/icc/SampleICC-1.3.2-Win64.patch
new file mode 100644
index 000000000000..ad1c8a54f81c
--- /dev/null
+++ b/icc/SampleICC-1.3.2-Win64.patch
@@ -0,0 +1,11 @@
+--- misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	2018-03-07 06:19:39.296824700 +0200
++++ misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h	2018-03-07 06:33:33.075513600 +0200
+@@ -80,7 +80,7 @@
+ #endif
+ 
+ //PC, visual C++
+-#if defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)
++#if defined(_MSC_VER) && !defined(__MWERKS__) && (defined(_M_IX86) || defined(_M_AMD64))
+ 
+   //Define how 64 bit integers are represented
+   #define ICCUINT64 unsigned __int64
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 40e849058e27..3b6d3102c75f 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,7 +34,7 @@ TARGET=icc
 
 TARFILE_NAME=SampleICC-1.3.2
 TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab
-PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch
+PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME).format-security.patch SampleICC-1.3.2-Win64.patch
 
 CONVERTFILES= \
     IccProfLib$/IccTagProfSeqId.h \
commit fbff6744fa4f49e5a3389a1c1d174b2a9914a211
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Mar 7 04:15:14 2018 +0000

    Add a linker map file for salhelper on Win64.
    
    Patch by: me

diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 440bc6c2b11e..2f9ed8485e98 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -64,6 +64,8 @@ DEF1NAME=	$(SHL1TARGET)
 
 .IF "$(COMNAME)"=="msci"
 SHL1VERSIONMAP=msci.map
+.ELIF "$(COMNAME)"=="mscx"
+SHL1VERSIONMAP=mscx.map
 .ELIF "$(GUI)"=="OS2"
 SHL1VERSIONMAP=gcc3os2.map
 .ELIF "$(COMNAME)"=="sunpro5"
diff --git a/salhelper/source/mscx.map b/salhelper/source/mscx.map
new file mode 100644
index 000000000000..a9d950b11e89
--- /dev/null
+++ b/salhelper/source/mscx.map
@@ -0,0 +1,58 @@
+###############################################################
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+###############################################################
+UDK_3_0_0 {
+    global:
+GetVersionInfo
+??0ORealDynamicLoader at salhelper@@IEAA at PEAPEAV01@AEBVOUString at rtl@@1PEAX2 at Z
+??1ORealDynamicLoader at salhelper@@MEAA at XZ
+??_7ORealDynamicLoader at salhelper@@6B@
+?acquire at ORealDynamicLoader@salhelper@@QEAAKXZ
+?getApi at ORealDynamicLoader@salhelper@@QEBAPEAXXZ
+?newInstance at ORealDynamicLoader@salhelper@@SAPEAV12 at PEAPEAV12@AEBVOUString at rtl@@1 at Z
+?release at ORealDynamicLoader@salhelper@@QEAAKXZ
+??1SimpleReferenceObject at salhelper@@MEAA at XZ
+??2SimpleReferenceObject at salhelper@@SAPEAX_K at Z
+??2SimpleReferenceObject at salhelper@@SAPEAX_KAEBUnothrow_t at std@@@Z
+??3SimpleReferenceObject at salhelper@@SAXPEAX at Z
+??3SimpleReferenceObject at salhelper@@SAXPEAXAEBUnothrow_t at std@@@Z
+    local:
+        *;
+};
+
+UDK_3.1 {
+    global:
+        ??_7SimpleReferenceObject at salhelper@@6B@;
+
+        ??0Condition at salhelper@@QEAA at AEAVMutex@osl@@@Z;
+        ??1Condition at salhelper@@UEAA at XZ;
+
+        ??0ConditionModifier at salhelper@@QEAA at AEAVCondition@1@@Z;
+        ??1ConditionModifier at salhelper@@QEAA at XZ
+
+        ??0ConditionWaiter at salhelper@@QEAA at AEAVCondition@1@@Z;
+        ??0ConditionWaiter at salhelper@@QEAA at AEAVCondition@1 at K@Z;
+        ??1ConditionWaiter at salhelper@@QEAA at XZ
+
+        ??0timedout at ConditionWaiter@salhelper@@QEAA at XZ;
+        ??0timedout at ConditionWaiter@salhelper@@QEAA at AEBU012@@Z;
+        ??1timedout at ConditionWaiter@salhelper@@UEAA at XZ;
+        ??4timedout at ConditionWaiter@salhelper@@QEAAAEAU012 at AEBU012@@Z;
+} UDK_3_0_0;