[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/wntmsc.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e2a3ac2773fb3303dff0a925743ce9ed2f29d6d1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jan 22 04:10:19 2011 +0200

    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.

diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 393f18f..e137e3c 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