diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-22 10:36:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-22 10:37:15 +0100 |
| commit | 7ec7f0df2960b74552224f0a9f7489f152b5faa1 (patch) | |
| tree | 9a4b4740d066897c08b30783f88807b72f4fc5ac | |
| parent | ab2186d2c699f1ca041f7e3bde9620139a6f671c (diff) | |
MinGW apparently needs to be forced into __cdecl
...otherwise bridges/source/cpp_uno/mingw_intel C++ ABI assumptions would not
meet what i686-w64-mingw32-g++ emits (though it is unclear to me how this shall
ever have worked before, as kendy claims it once did; also, at least for me,
"wine soffice.exe" still does not work, as there is apparently confusion about
C++ exception stack unwinding between GCC and cpp_uno/mingw_intel code).
| -rw-r--r-- | sal/inc/sal/types.h | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 7575be4645a2..52b008f0937f 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -256,13 +256,8 @@ typedef void * sal_Handle; #endif // defined(_MSC_VER) # define SAL_DLLPRIVATE # define SAL_DLLPUBLIC_TEMPLATE -#if defined(_MSC_VER) # define SAL_CALL __cdecl # define SAL_CALL_ELLIPSE __cdecl -#else -# define SAL_CALL -# define SAL_CALL_ELLIPSE -#endif #elif defined SAL_UNX # if defined(__SUNPRO_CC) && (__SUNPRO_CC >= 0x550) # define SAL_DLLPUBLIC_EXPORT __global diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 161ad2cb41f8..363f1f3ead00 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -45,6 +45,7 @@ gb_COMPILERDEFS += \ -D_NATIVE_WCHAR_T_DEFINED \ -D_MSC_EXTENSIONS \ -D_FORCENAMELESSUNION \ + -DBOOST_MEM_FN_ENABLE_CDECL \ gb_RCDEFS := \ -DWINVER=0x0400 \ |