diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_cstdlib.h --- a/epoc32/include/stdapis/stlportv5/stl/_cstdlib.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_cstdlib.h Wed Mar 31 12:33:34 2010 +0100 @@ -121,13 +121,13 @@ #if !defined (__HP_aCC) || (__HP_aCC < 30000) //MSVC starting with .Net 2003 already define all math functions in global namespace: -# if !defined (_STLP_MSVC_LIB) || (_STLP_MSVC_LIB < 1310) || defined(UNDER_CE) +# if ((!defined (_STLP_MSVC_LIB) || (_STLP_MSVC_LIB < 1310) || defined(UNDER_CE)) && !(defined(__SYMBIAN32__) && defined(__GCCXML__))) inline long abs(long __x) { return _STLP_VENDOR_CSTD::labs(__x); } # endif /** VC since version 8 has this, the platform SDK and CE SDKs hanging behind. */ -# if !defined (_STLP_MSVC_LIB) || (_STLP_MSVC_LIB < 1400) || defined (_STLP_USING_PLATFORM_SDK_COMPILER) || defined(UNDER_CE) -inline _STLP_VENDOR_CSTD::ldiv_t div(long __x, long __y) { return _STLP_VENDOR_CSTD::ldiv(__x, __y); } +# if ((!defined (_STLP_MSVC_LIB) || (_STLP_MSVC_LIB < 1400) || defined (_STLP_USING_PLATFORM_SDK_COMPILER) || defined(UNDER_CE)) && !(defined(__SYMBIAN32__) && defined(__GCCXML__))) +inline _STLP_VENDOR_CSTD::ldiv_t div(long __x, long __y) { return _STLP_VENDOR_CSTD::ldiv(__x, __y);} # endif #endif