summaryrefslogtreecommitdiff
path: root/bridges/source
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2014-11-30 12:35:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-02 09:07:16 +0000
commit684facf115df0f06bc3cf405b4429f97b0891370 (patch)
tree40e951ab5985c67b7dc5c9eb02dc9493b65756f8 /bridges/source
parent503379fa0b06b66ab6f2bbedc73cdcb056545330 (diff)
MSVC 2013: Compute uno bridge exception offset for X64
Change-Id: I34b308db422d861098fdf93cff8fea63128ba47a Reviewed-on: https://gerrit.libreoffice.org/13211 Tested-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges/source')
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx4
1 files changed, 3 insertions, 1 deletions
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 a1c27c6948b5..b6727ea5e257 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -722,7 +722,9 @@ int mscx_filterCppException(
// MSVS9/crt/src/mtdll.h:
// offsetof (_tiddata, _curexception) -
// offsetof (_tiddata, _tpxcptinfoptrs):
-#if _MSC_VER < 1600
+#if _MSC_VER <= 1800 // VC 2013
+ //
+ // See dev-tools/uno/uno_exception_offset
0x48 // msvcr90.dll
#else
error, please find value for this compiler version