[Libreoffice-commits] core.git: bridges/source

[David Ostrovsky]

 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b9bf1123f35d78fb98964fd56b50f330ee3efd71
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Aug 31 22:31:08 2015 +0200

    Fix x86-64 bridge on MSVC 14.0
    
    Change-Id: I6729a5028351a8a1c3d2b2d2f4bc7ab73e0730f2
    Reviewed-on: https://gerrit.libreoffice.org/18213
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 3ce1065..f543236 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -245,6 +245,7 @@ void
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
 #include <sal/log.hxx>
+#include <osl/mutex.hxx>
 
 #include "com/sun/star/uno/Any.hxx"
 #include <unordered_map>
@@ -874,7 +875,7 @@ int mscx_filterCppException(
             // MSVS9/crt/src/mtdll.h:
             // offsetof (_tiddata, _curexception) -
             // offsetof (_tiddata, _tpxcptinfoptrs):
-#if _MSC_VER <= 1800 // VC 2013
+#if _MSC_VER <= 1900 // VC 2015
             //
             // See dev-tools/uno/uno_exception_offset
             0x48 // msvcr90.dll