diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-22 04:10:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-22 04:10:19 +0200 |
| commit | 202e8927333530bf147e93cb27e255e89c3a4f70 (patch) | |
| tree | fdc4982500bf7504484ffd6a0fb90e98ed808703 /solenv/inc | |
| parent | 4e6ca0ec0398b11e4078c8da075022a925da0330 (diff) | |
Don't use BOOST_MEM_FN_ENABLE_CDECL on x64 Windows
cdecl is the only calling convention anyway, and using
BOOST_MEM_FN_ENABLE_CDECL actually leads to compilation errors for
instance in basegfx.
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/wntmsc.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index 393f18f4e3cc..e137e3c67da3 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -125,8 +125,10 @@ RSCDEFS+=-DFULL_DESK CFLAGSEXCEPTIONS=-EHa CFLAGS_NO_EXCEPTIONS= +.IF "$(CL_X64)" == "" # enable boost support for __cdecl (SAL_CALL) C++-UNO interface methods CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL +.ENDIF # with the current debug switches PCH won't work # anyway. so keep the existing .pch intact and don't |