diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/tools/stlport/stl/config/_icc.h --- a/epoc32/include/tools/stlport/stl/config/_icc.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/tools/stlport/stl/config/_icc.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,44 +1,44 @@ -// STLport configuration file -// It is internal STLport header - DO NOT include it directly -// A list of Intel compiler for Linux portion of STLport settings. - -#define _STLP_COMPILER "Intel ICC" - -#define _STLP_LONG_LONG long long - -// Edit relative path below (or put full path) to get native -// compiler headers included. Default is "../include". -// C headers may reside in different directory, so separate macro is provided. -#if (__INTEL_COMPILER < 800) -# define _STLP_NATIVE_INCLUDE_PATH ../include -# define _STLP_NATIVE_C_INCLUDE_PATH ../include -# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include -#endif - -#if (__INTEL_COMPILER >= 800) -# define _STLP_NATIVE_INCLUDE_PATH ../include/c++ -# define _STLP_NATIVE_C_INCLUDE_PATH ../include -# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include - -#endif /* __INTEL_COMPILER >= 800 */ - -#define _STLP_HAS_NO_NEW_C_HEADERS 1 -#define _STLP_VENDOR_GLOBAL_CSTD 1 - -/* Systems having GLIBC installed have different traits */ -#if !defined (_STLP_USE_GLIBC) && defined (__linux__) -# define _STLP_USE_GLIBC -# define _XOPEN_SOURCE 600 -#endif - -#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT - - -#ifndef __GNUC__ -# define __GNUC__ 3 -#endif - -//#define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 - -#define _STLP_NO_FORCE_INSTANTIATE -//#define _REENTRANT +// STLport configuration file +// It is internal STLport header - DO NOT include it directly +// A list of Intel compiler for Linux portion of STLport settings. + +#define _STLP_COMPILER "Intel ICC" + +#define _STLP_LONG_LONG long long + +// Edit relative path below (or put full path) to get native +// compiler headers included. Default is "../include". +// C headers may reside in different directory, so separate macro is provided. +#if (__INTEL_COMPILER < 800) +# define _STLP_NATIVE_INCLUDE_PATH ../include +# define _STLP_NATIVE_C_INCLUDE_PATH ../include +# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include +#endif + +#if (__INTEL_COMPILER >= 800) +# define _STLP_NATIVE_INCLUDE_PATH ../include/c++ +# define _STLP_NATIVE_C_INCLUDE_PATH ../include +# define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../include + +#endif /* __INTEL_COMPILER >= 800 */ + +#define _STLP_HAS_NO_NEW_C_HEADERS 1 +#define _STLP_VENDOR_GLOBAL_CSTD 1 + +/* Systems having GLIBC installed have different traits */ +#if !defined (_STLP_USE_GLIBC) && defined (__linux__) +# define _STLP_USE_GLIBC +# define _XOPEN_SOURCE 600 +#endif + +#undef _STLP_NO_UNCAUGHT_EXCEPT_SUPPORT + + +#ifndef __GNUC__ +# define __GNUC__ 3 +#endif + +//#define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 + +#define _STLP_NO_FORCE_INSTANTIATE +//#define _REENTRANT