diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/tools/stlport/stl/config/_solaris.h --- a/epoc32/include/tools/stlport/stl/config/_solaris.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/tools/stlport/stl/config/_solaris.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,85 +1,85 @@ -#ifndef __stl_config__solaris_h -#define __stl_config__solaris_h - -#define _STLP_PLATFORM "Sun Solaris" - -/* include system features file */ -#include - -/* system-dependent defines */ - -/* - * Should be fixed: - * 1. __SunOS_5_x not defined, and no way to derive this from headers only; - * define it with -D on compiler command line is a bad idea too. - * - * 2. Solaris may has, but may hasn't MATH_F and MATH_L functions (even with two - * underscores)---this depends upon system update level and seems legally present - * only in Solaris 10 (i.e. I saw Solaris 9 with and without __acosf in libm.so.1) - * - * - ptr - */ - -#if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L) -# define _STLP_HAS_NATIVE_FLOAT_ABS -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4) -# define _STLP_RAND48 1 -#endif - -#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) || defined (__SunOS_5_6) -# define _STLP_WCHAR_SUNPRO_EXCLUDE 1 -# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 -#endif - -/* boris : this should always be defined for Solaris 5 & 6. Any ideas how to do it? */ -#if !(defined ( __KCC ) && __KCC_VERSION > 3400 ) && \ - ((defined(__SunOS_5_5_1) || defined(__SunOS_5_6) )) -# ifndef _STLP_NO_NATIVE_MBSTATE_T -# define _STLP_NO_NATIVE_MBSTATE_T 1 -# endif -#endif /* KCC */ - -/* For SPARC we use lightweight synchronization */ -#if defined (__sparc) /* && (defined (_REENTRANT) || defined (_PTHREADS)) */ -# if ( (defined (__GNUC__) && defined (__sparc_v9__)) || \ - defined (__sparcv9) ) \ - && !defined(_NOTHREADS) && !defined (_STLP_NO_SPARC_SOLARIS_THREADS) -# define _STLP_SPARC_SOLARIS_THREADS -# define _STLP_THREADS_DEFINED -# endif -#endif - -/* gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus. - * limits.h contains invalid values for this combination - */ -#ifdef __GNUC__ -# if (defined (__sparc_v9__) || defined (__sparcv9)) && !defined ( __WORD64 ) -# define __LONG_MAX__ 2147483647L -# endif -#endif - -/* - * Hmm, I don't found in Solaris 9 system headers definition like __SunOS_5_9 - * (defined in SunPro?); I also can't find functions like fmodf (again, - * I found modff in libc, but no acosf etc.). Strange, I saw __cosf functions - * (built-in?) at least with gcc some time ago, but don't see ones with - * gcc 3.3.2 on SunOS sparc-solaris1 5.9 Generic_112233-03 sun4u sparc SUNW,Ultra-60 - * from Sorceforge's CF. - * 2005-12-15, - ptr - * - * P.S. That's why I add two defines: - */ - -/* #ifdef __GNUC__ */ -#define _STLP_NO_VENDOR_MATH_F -#define _STLP_NO_VENDOR_MATH_L -/* #endif */ - -#ifdef __GNUC__ -# define _STLP_WCHAR_BORLAND_EXCLUDE -# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 -#endif - -#endif /* __stl_config__solaris_h */ +#ifndef __stl_config__solaris_h +#define __stl_config__solaris_h + +#define _STLP_PLATFORM "Sun Solaris" + +/* include system features file */ +#include + +/* system-dependent defines */ + +/* + * Should be fixed: + * 1. __SunOS_5_x not defined, and no way to derive this from headers only; + * define it with -D on compiler command line is a bad idea too. + * + * 2. Solaris may has, but may hasn't MATH_F and MATH_L functions (even with two + * underscores)---this depends upon system update level and seems legally present + * only in Solaris 10 (i.e. I saw Solaris 9 with and without __acosf in libm.so.1) + * + * - ptr + */ + +#if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L) +# define _STLP_HAS_NATIVE_FLOAT_ABS +#endif + +#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4) +# define _STLP_RAND48 1 +#endif + +#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) || defined (__SunOS_5_6) +# define _STLP_WCHAR_SUNPRO_EXCLUDE 1 +# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 +#endif + +/* boris : this should always be defined for Solaris 5 & 6. Any ideas how to do it? */ +#if !(defined ( __KCC ) && __KCC_VERSION > 3400 ) && \ + ((defined(__SunOS_5_5_1) || defined(__SunOS_5_6) )) +# ifndef _STLP_NO_NATIVE_MBSTATE_T +# define _STLP_NO_NATIVE_MBSTATE_T 1 +# endif +#endif /* KCC */ + +/* For SPARC we use lightweight synchronization */ +#if defined (__sparc) /* && (defined (_REENTRANT) || defined (_PTHREADS)) */ +# if ( (defined (__GNUC__) && defined (__sparc_v9__)) || \ + defined (__sparcv9) ) \ + && !defined(_NOTHREADS) && !defined (_STLP_NO_SPARC_SOLARIS_THREADS) +# define _STLP_SPARC_SOLARIS_THREADS +# define _STLP_THREADS_DEFINED +# endif +#endif + +/* gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus. + * limits.h contains invalid values for this combination + */ +#ifdef __GNUC__ +# if (defined (__sparc_v9__) || defined (__sparcv9)) && !defined ( __WORD64 ) +# define __LONG_MAX__ 2147483647L +# endif +#endif + +/* + * Hmm, I don't found in Solaris 9 system headers definition like __SunOS_5_9 + * (defined in SunPro?); I also can't find functions like fmodf (again, + * I found modff in libc, but no acosf etc.). Strange, I saw __cosf functions + * (built-in?) at least with gcc some time ago, but don't see ones with + * gcc 3.3.2 on SunOS sparc-solaris1 5.9 Generic_112233-03 sun4u sparc SUNW,Ultra-60 + * from Sorceforge's CF. + * 2005-12-15, - ptr + * + * P.S. That's why I add two defines: + */ + +/* #ifdef __GNUC__ */ +#define _STLP_NO_VENDOR_MATH_F +#define _STLP_NO_VENDOR_MATH_L +/* #endif */ + +#ifdef __GNUC__ +# define _STLP_WCHAR_BORLAND_EXCLUDE +# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1 +#endif + +#endif /* __stl_config__solaris_h */