mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix x86-64 bridge on MSVC 14.0

Browse Source 
Change-Id: I6729a5028351a8a1c3d2b2d2f4bc7ab73e0730f2
Reviewed-on: https://gerrit.libreoffice.org/18213
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2015-08-31 22:31:08 +02:00
committed by Michael Stahl
parent 0847e48054
commit b9bf1123f3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
View File

@@ -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