1.1 --- a/epoc32/include/tools/stlport/stl/config/_solaris.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/tools/stlport/stl/config/_solaris.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,85 +1,85 @@
1.4 -#ifndef __stl_config__solaris_h
1.5 -#define __stl_config__solaris_h
1.6 -
1.7 -#define _STLP_PLATFORM "Sun Solaris"
1.8 -
1.9 -/* include system features file */
1.10 -#include <sys/feature_tests.h>
1.11 -
1.12 -/* system-dependent defines */
1.13 -
1.14 -/*
1.15 - * Should be fixed:
1.16 - * 1. __SunOS_5_x not defined, and no way to derive this from headers only;
1.17 - * define it with -D on compiler command line is a bad idea too.
1.18 - *
1.19 - * 2. Solaris may has, but may hasn't MATH_F and MATH_L functions (even with two
1.20 - * underscores)---this depends upon system update level and seems legally present
1.21 - * only in Solaris 10 (i.e. I saw Solaris 9 with and without __acosf in libm.so.1)
1.22 - *
1.23 - * - ptr
1.24 - */
1.25 -
1.26 -#if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L)
1.27 -# define _STLP_HAS_NATIVE_FLOAT_ABS
1.28 -#endif
1.29 -
1.30 -#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
1.31 -# define _STLP_RAND48 1
1.32 -#endif
1.33 -
1.34 -#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) || defined (__SunOS_5_6)
1.35 -# define _STLP_WCHAR_SUNPRO_EXCLUDE 1
1.36 -# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
1.37 -#endif
1.38 -
1.39 -/* boris : this should always be defined for Solaris 5 & 6. Any ideas how to do it? */
1.40 -#if !(defined ( __KCC ) && __KCC_VERSION > 3400 ) && \
1.41 - ((defined(__SunOS_5_5_1) || defined(__SunOS_5_6) ))
1.42 -# ifndef _STLP_NO_NATIVE_MBSTATE_T
1.43 -# define _STLP_NO_NATIVE_MBSTATE_T 1
1.44 -# endif
1.45 -#endif /* KCC */
1.46 -
1.47 -/* For SPARC we use lightweight synchronization */
1.48 -#if defined (__sparc) /* && (defined (_REENTRANT) || defined (_PTHREADS)) */
1.49 -# if ( (defined (__GNUC__) && defined (__sparc_v9__)) || \
1.50 - defined (__sparcv9) ) \
1.51 - && !defined(_NOTHREADS) && !defined (_STLP_NO_SPARC_SOLARIS_THREADS)
1.52 -# define _STLP_SPARC_SOLARIS_THREADS
1.53 -# define _STLP_THREADS_DEFINED
1.54 -# endif
1.55 -#endif
1.56 -
1.57 -/* gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus.
1.58 - * limits.h contains invalid values for this combination
1.59 - */
1.60 -#ifdef __GNUC__
1.61 -# if (defined (__sparc_v9__) || defined (__sparcv9)) && !defined ( __WORD64 )
1.62 -# define __LONG_MAX__ 2147483647L
1.63 -# endif
1.64 -#endif
1.65 -
1.66 -/*
1.67 - * Hmm, I don't found in Solaris 9 system headers definition like __SunOS_5_9
1.68 - * (defined in SunPro?); I also can't find functions like fmodf (again,
1.69 - * I found modff in libc, but no acosf etc.). Strange, I saw __cosf functions
1.70 - * (built-in?) at least with gcc some time ago, but don't see ones with
1.71 - * gcc 3.3.2 on SunOS sparc-solaris1 5.9 Generic_112233-03 sun4u sparc SUNW,Ultra-60
1.72 - * from Sorceforge's CF.
1.73 - * 2005-12-15, - ptr
1.74 - *
1.75 - * P.S. That's why I add two defines:
1.76 - */
1.77 -
1.78 -/* #ifdef __GNUC__ */
1.79 -#define _STLP_NO_VENDOR_MATH_F
1.80 -#define _STLP_NO_VENDOR_MATH_L
1.81 -/* #endif */
1.82 -
1.83 -#ifdef __GNUC__
1.84 -# define _STLP_WCHAR_BORLAND_EXCLUDE
1.85 -# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
1.86 -#endif
1.87 -
1.88 -#endif /* __stl_config__solaris_h */
1.89 +#ifndef __stl_config__solaris_h
1.90 +#define __stl_config__solaris_h
1.91 +
1.92 +#define _STLP_PLATFORM "Sun Solaris"
1.93 +
1.94 +/* include system features file */
1.95 +#include <sys/feature_tests.h>
1.96 +
1.97 +/* system-dependent defines */
1.98 +
1.99 +/*
1.100 + * Should be fixed:
1.101 + * 1. __SunOS_5_x not defined, and no way to derive this from headers only;
1.102 + * define it with -D on compiler command line is a bad idea too.
1.103 + *
1.104 + * 2. Solaris may has, but may hasn't MATH_F and MATH_L functions (even with two
1.105 + * underscores)---this depends upon system update level and seems legally present
1.106 + * only in Solaris 10 (i.e. I saw Solaris 9 with and without __acosf in libm.so.1)
1.107 + *
1.108 + * - ptr
1.109 + */
1.110 +
1.111 +#if defined (__SunOS_5_8) && ! defined (_STLP_HAS_NO_NEW_C_HEADERS) && ( __cplusplus >= 199711L)
1.112 +# define _STLP_HAS_NATIVE_FLOAT_ABS
1.113 +#endif
1.114 +
1.115 +#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
1.116 +# define _STLP_RAND48 1
1.117 +#endif
1.118 +
1.119 +#if (defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 == 4)) || defined (__SunOS_5_6)
1.120 +# define _STLP_WCHAR_SUNPRO_EXCLUDE 1
1.121 +# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
1.122 +#endif
1.123 +
1.124 +/* boris : this should always be defined for Solaris 5 & 6. Any ideas how to do it? */
1.125 +#if !(defined ( __KCC ) && __KCC_VERSION > 3400 ) && \
1.126 + ((defined(__SunOS_5_5_1) || defined(__SunOS_5_6) ))
1.127 +# ifndef _STLP_NO_NATIVE_MBSTATE_T
1.128 +# define _STLP_NO_NATIVE_MBSTATE_T 1
1.129 +# endif
1.130 +#endif /* KCC */
1.131 +
1.132 +/* For SPARC we use lightweight synchronization */
1.133 +#if defined (__sparc) /* && (defined (_REENTRANT) || defined (_PTHREADS)) */
1.134 +# if ( (defined (__GNUC__) && defined (__sparc_v9__)) || \
1.135 + defined (__sparcv9) ) \
1.136 + && !defined(_NOTHREADS) && !defined (_STLP_NO_SPARC_SOLARIS_THREADS)
1.137 +# define _STLP_SPARC_SOLARIS_THREADS
1.138 +# define _STLP_THREADS_DEFINED
1.139 +# endif
1.140 +#endif
1.141 +
1.142 +/* gcc does not support ELF64 yet ; however; it supports ultrasparc + v8plus.
1.143 + * limits.h contains invalid values for this combination
1.144 + */
1.145 +#ifdef __GNUC__
1.146 +# if (defined (__sparc_v9__) || defined (__sparcv9)) && !defined ( __WORD64 )
1.147 +# define __LONG_MAX__ 2147483647L
1.148 +# endif
1.149 +#endif
1.150 +
1.151 +/*
1.152 + * Hmm, I don't found in Solaris 9 system headers definition like __SunOS_5_9
1.153 + * (defined in SunPro?); I also can't find functions like fmodf (again,
1.154 + * I found modff in libc, but no acosf etc.). Strange, I saw __cosf functions
1.155 + * (built-in?) at least with gcc some time ago, but don't see ones with
1.156 + * gcc 3.3.2 on SunOS sparc-solaris1 5.9 Generic_112233-03 sun4u sparc SUNW,Ultra-60
1.157 + * from Sorceforge's CF.
1.158 + * 2005-12-15, - ptr
1.159 + *
1.160 + * P.S. That's why I add two defines:
1.161 + */
1.162 +
1.163 +/* #ifdef __GNUC__ */
1.164 +#define _STLP_NO_VENDOR_MATH_F
1.165 +#define _STLP_NO_VENDOR_MATH_L
1.166 +/* #endif */
1.167 +
1.168 +#ifdef __GNUC__
1.169 +# define _STLP_WCHAR_BORLAND_EXCLUDE
1.170 +# define _STLP_NO_NATIVE_WIDE_FUNCTIONS 1
1.171 +#endif
1.172 +
1.173 +#endif /* __stl_config__solaris_h */