# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1279039894 -3600
# Node ID 97e3c206731f4344e739920aaec8f23bbd5365dc
# Parent  6896b031c3e17a4a84d8b7d0083543e8cdfa3675# Parent  ddd39d92c35063fcd033e5d72ba09336e083c5b5
Merge fixes for bug 2603 and bug 3123.

diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h	Tue Jul 13 17:51:34 2010 +0100
@@ -26,6 +26,12 @@
 #ifndef _STLP_INTERNAL_THREADS_H
 #define _STLP_INTERNAL_THREADS_H
 
+
+#ifdef __SYMBIAN32__
+#include <e32atomics.h>  // For atomic increment and decrement
+#endif
+
+
 // Supported threading models are native SGI, pthreads, uithreads
 // (similar to pthreads, but based on an earlier draft of the Posix
 // threads standard), and Win32 threads.  Uithread support by Jochen
@@ -464,13 +470,22 @@
 #if defined (__DMC__)
 public:
 #endif
-  _STLP_VOLATILE __stl_atomic_t _M_ref_count;
+  _STLP_VOLATILE  __stl_atomic_t _M_ref_count;
 
 #if defined (_STLP_THREADS) && \
    (!defined (_STLP_ATOMIC_INCREMENT) || !defined (_STLP_ATOMIC_DECREMENT) || \
     (defined (_STLP_WIN32_VERSION) && (_STLP_WIN32_VERSION <= 0x0400)))
 #  define _STLP_USE_MUTEX
-  _STLP_mutex _M_mutex;
+    #ifndef __SYMBIAN32__  
+      _STLP_mutex _M_mutex;
+    #else
+    #define KSizeofStlpMutex 12
+      /* 
+       * Padding in order to ensure compatability. 
+       * The pad size is the size of the _STLP_mutex structure
+       */
+     char _pad[KSizeofStlpMutex];
+    #endif
 #endif
 
   public:
@@ -484,14 +499,25 @@
    __stl_atomic_t _M_decr() { return _STLP_ATOMIC_DECREMENT(&_M_ref_count); }
 #  else
 #    undef _STLP_USE_MUTEX
-  __stl_atomic_t _M_incr() {
-    _STLP_auto_lock l(_M_mutex);
-    return ++_M_ref_count;
-  }
-  __stl_atomic_t _M_decr() {
-    _STLP_auto_lock l(_M_mutex);
-    return --_M_ref_count;
-  }
+    #ifndef __SYMBIAN32__
+      __stl_atomic_t _M_incr() {
+        _STLP_auto_lock l(_M_mutex);
+        return ++_M_ref_count;
+      }
+      __stl_atomic_t _M_decr() {
+        _STLP_auto_lock l(_M_mutex);
+        return --_M_ref_count;
+      }
+    #else
+      __stl_atomic_t _M_incr() {
+          __e32_atomic_tas_ord32(&_M_ref_count, 0, 1, 1);
+          return _M_ref_count;
+      }
+      __stl_atomic_t _M_decr() {
+          __e32_atomic_tas_ord32(&_M_ref_count, 1, -1, 0);
+          return _M_ref_count;
+      }
+    #endif
 #  endif
 #else  /* No threads */
   __stl_atomic_t _M_incr() { return ++_M_ref_count; }
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp	Tue Jul 13 17:51:34 2010 +0100
@@ -309,11 +309,14 @@
 void CLocalSystemInterface::Exit(int code)
 	{
 #ifdef SYMBIAN_OE_POSIX_SIGNALS
-    TRequestStatus status = KRequestPending;
-    iSignalHandlerThread.Logon(status);
-	iSignalLoopRunning = EFalse;
-	iSignalHandlerThread.RequestSignal();
-	User::WaitForRequest(status);
+    if(iSignalsInitialized)
+        {
+        TRequestStatus status = KRequestPending;
+        iSignalHandlerThread.Logon(status);
+        iSignalLoopRunning = EFalse;
+        iSignalHandlerThread.RequestSignal();
+        User::WaitForRequest(status);
+        }
 #endif
 	iFids.Close();
 	User::SetCritical(User::EProcessPermanent);
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp
--- a/genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp	Tue Jul 13 17:51:34 2010 +0100
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <netinet/in.h>
 #include <sys/un.h>
-#include <utf.H>
+#include <utf.h>
 #include "fdesc.h"
 #include "systemspecialfilercg.h"
 #include "lposix.h"
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/backend/src/signalserver/server/signalserver.cpp
--- a/genericopenlibs/openenvcore/backend/src/signalserver/server/signalserver.cpp	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/backend/src/signalserver/server/signalserver.cpp	Tue Jul 13 17:51:34 2010 +0100
@@ -255,14 +255,16 @@
 				lHdl.mPid = lPid;
 				lHdl.mPipe.Open(aMessage,0);
 				iProcessHdlList.Append(lHdl);
+				aMessage.Complete(KErrNone);
 				}
 			else
 				{
 				if(iProcessHdlList[lIndex].mPipe.Open(aMessage,0)!=KErrNone)
 					aMessage.Complete(KErrGeneral);
+				else
+					aMessage.Complete(KErrNone);
 				}
-			aMessage.Complete(KErrNone);
-			
+
 			lProcess.Close();
 			lClientThread.Close();
 			break;
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/include/math.h
--- a/genericopenlibs/openenvcore/include/math.h	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/include/math.h	Tue Jul 13 17:51:34 2010 +0100
@@ -17,7 +17,7 @@
  */
 
 #ifndef _MATH_H_
-#define	_MATH_H_
+#define _MATH_H_
 
 
 #ifdef __SYMBIAN32__
@@ -41,6 +41,11 @@
 
 #ifdef __SYMBIAN32__
 #include <_ansi.h>
+#ifdef __WINSCW__
+#ifndef __SOFTFP
+#define __SOFTFP
+#endif /* __SOFTFP */
+#endif//__WINSCW__
 #endif //__SYMBIAN32__
 
 #include <sys/cdefs.h>
@@ -54,7 +59,7 @@
 #include "signgam.h"
 
 // IEC 559 math functionality
-#define __STDC_IEC_559__		1
+#define __STDC_IEC_559__        1
 #endif //__SYMBIAN32__
 
 /*
@@ -62,142 +67,142 @@
  */
 #ifndef __SYMBIAN32__
 extern const union __infinity_un {
-	unsigned char	__uc[8];
-	double		__ud;
+    unsigned char   __uc[8];
+    double      __ud;
 } __infinity;
 
 extern const union __nan_un {
-	unsigned char	__uc[sizeof(float)];
-	float		__uf;
+    unsigned char   __uc[sizeof(float)];
+    float       __uf;
 } __nan;
 #endif //__SYMBIAN32__
 
 #if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__MATH_BUILTIN_CONSTANTS
+#define __MATH_BUILTIN_CONSTANTS
 #endif
 
 #if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER)
-#define	__MATH_BUILTIN_RELOPS
+#define __MATH_BUILTIN_RELOPS
 #endif
 
 #ifdef __SYMBIAN32__
-#define	HUGE_VAL	__infinite(1.0)
+#define HUGE_VAL    __infinite(1.0)
 #else
 #ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VAL	__builtin_huge_val()
+#define HUGE_VAL    __builtin_huge_val()
 #else
-#define	HUGE_VAL	(__infinity.__ud)
+#define HUGE_VAL    (__infinity.__ud)
 #endif
 #endif //__SYMBIAN32__
 
 #if __ISO_C_VISIBLE >= 1999
-#define	FP_ILOGB0	(-__INT_MAX)
-#define	FP_ILOGBNAN	__INT_MAX
+#define FP_ILOGB0   (-__INT_MAX)
+#define FP_ILOGBNAN __INT_MAX
 
 #ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VALF	__builtin_huge_valf()
-#define	HUGE_VALL	__builtin_huge_vall()
-#define	INFINITY	__builtin_inf()
-#define	NAN		__builtin_nan("")
+#define HUGE_VALF   __builtin_huge_valf()
+#define HUGE_VALL   __builtin_huge_vall()
+#define INFINITY    __builtin_inf()
+#define NAN     __builtin_nan("")
 #else
-#define	HUGE_VALF	(float)HUGE_VAL
-#define	HUGE_VALL	(long double)HUGE_VAL
-#define	INFINITY	HUGE_VALF
+#define HUGE_VALF   (float)HUGE_VAL
+#define HUGE_VALL   (long double)HUGE_VAL
+#define INFINITY    HUGE_VALF
 #ifdef __SYMBIAN32__
-#define NAN		nanvalf()
+#define NAN     nanvalf()
 #else
-#define	NAN		(__nan.__uf)
+#define NAN     (__nan.__uf)
 #endif //__SYMBIAN32__
 #endif /* __MATH_BUILTIN_CONSTANTS */
 
-#define	MATH_ERRNO	1
-#define	MATH_ERREXCEPT	2
-#define	math_errhandling	MATH_ERREXCEPT
+#define MATH_ERRNO  1
+#define MATH_ERREXCEPT  2
+#define math_errhandling    MATH_ERREXCEPT
 
 /* XXX We need a <machine/math.h>. */
 #if defined(__ia64__) || defined(__sparc64__)
-#define	FP_FAST_FMA
+#define FP_FAST_FMA
 #endif
 #ifdef __ia64__
-#define	FP_FAST_FMAL
+#define FP_FAST_FMAL
 #endif
-#define	FP_FAST_FMAF
+#define FP_FAST_FMAF
 
 /* Symbolic constants to classify floating point numbers. */
-#define	FP_INFINITE	0x01
-#define	FP_NAN		0x02
-#define	FP_NORMAL	0x04
-#define	FP_SUBNORMAL	0x08
-#define	FP_ZERO		0x10
+#define FP_INFINITE 0x01
+#define FP_NAN      0x02
+#define FP_NORMAL   0x04
+#define FP_SUBNORMAL    0x08
+#define FP_ZERO     0x10
 
-#define	fpclassify(x) \
+#define fpclassify(x) \
     ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \
     : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \
     : __fpclassifyl(x))
 
-#define	isfinite(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isfinite(x)	\
+#define isfinite(x)                 \
+    ((sizeof (x) == sizeof (float)) ? __isfinitef(x)    \
+    : (sizeof (x) == sizeof (double)) ? __isfinite(x)   \
     : __isfinitel(x))
-#define	isinf(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isinff(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isinf(x)	\
+#define isinf(x)                    \
+    ((sizeof (x) == sizeof (float)) ? __isinff(x)   \
+    : (sizeof (x) == sizeof (double)) ? __isinf(x)  \
     : __isinfl(x))
-#define	isnan(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnanf(x)		\
-    : (sizeof (x) == sizeof (double)) ? __isnan(x)	\
+#define isnan(x)                    \
+    ((sizeof (x) == sizeof (float)) ? __isnanf(x)       \
+    : (sizeof (x) == sizeof (double)) ? __isnan(x)  \
     : __isnanl(x))
-#define	isnormal(x)					\
-    ((sizeof (x) == sizeof (float)) ? __isnormalf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __isnormal(x)	\
+#define isnormal(x)                 \
+    ((sizeof (x) == sizeof (float)) ? __isnormalf(x)    \
+    : (sizeof (x) == sizeof (double)) ? __isnormal(x)   \
     : __isnormall(x))
 
 
 #ifdef __MATH_BUILTIN_RELOPS
-#define	isgreater(x, y)		__builtin_isgreater((x), (y))
-#define	isgreaterequal(x, y)	__builtin_isgreaterequal((x), (y))
-#define	isless(x, y)		__builtin_isless((x), (y))
-#define	islessequal(x, y)	__builtin_islessequal((x), (y))
-#define	islessgreater(x, y)	__builtin_islessgreater((x), (y))
-#define	isunordered(x, y)	__builtin_isunordered((x), (y))
+#define isgreater(x, y)     __builtin_isgreater((x), (y))
+#define isgreaterequal(x, y)    __builtin_isgreaterequal((x), (y))
+#define isless(x, y)        __builtin_isless((x), (y))
+#define islessequal(x, y)   __builtin_islessequal((x), (y))
+#define islessgreater(x, y) __builtin_islessgreater((x), (y))
+#define isunordered(x, y)   __builtin_isunordered((x), (y))
 #else
-#define	isgreater(x, y)		(!isunordered((x), (y)) && (x) > (y))
-#define	isgreaterequal(x, y)	(!isunordered((x), (y)) && (x) >= (y))
-#define	isless(x, y)		(!isunordered((x), (y)) && (x) < (y))
-#define	islessequal(x, y)	(!isunordered((x), (y)) && (x) <= (y))
-#define	islessgreater(x, y)	(!isunordered((x), (y)) && \
-					((x) > (y) || (y) > (x)))
-#define	isunordered(x, y)	(isnan(x) || isnan(y))
+#define isgreater(x, y)     (!isunordered((x), (y)) && (x) > (y))
+#define isgreaterequal(x, y)    (!isunordered((x), (y)) && (x) >= (y))
+#define isless(x, y)        (!isunordered((x), (y)) && (x) < (y))
+#define islessequal(x, y)   (!isunordered((x), (y)) && (x) <= (y))
+#define islessgreater(x, y) (!isunordered((x), (y)) && \
+                    ((x) > (y) || (y) > (x)))
+#define isunordered(x, y)   (isnan(x) || isnan(y))
 #endif /* __MATH_BUILTIN_RELOPS */
 
-#define	signbit(x)					\
-    ((sizeof (x) == sizeof (float)) ? __signbitf(x)	\
-    : (sizeof (x) == sizeof (double)) ? __signbit(x)	\
+#define signbit(x)                  \
+    ((sizeof (x) == sizeof (float)) ? __signbitf(x) \
+    : (sizeof (x) == sizeof (double)) ? __signbit(x)    \
     : __signbitl(x))
 
-typedef	__double_t	double_t;
-typedef	__float_t	float_t;
+typedef __double_t  double_t;
+typedef __float_t   float_t;
 #endif /* __ISO_C_VISIBLE >= 1999 */
 
 /*
  * XOPEN/SVID
  */
 #if __BSD_VISIBLE || __XSI_VISIBLE
-#define	M_E		2.7182818284590452354	/* e */
-#define	M_LOG2E		1.4426950408889634074	/* log 2e */
-#define	M_LOG10E	0.43429448190325182765	/* log 10e */
-#define	M_LN2		0.69314718055994530942	/* log e2 */
-#define	M_LN10		2.30258509299404568402	/* log e10 */
-#define	M_PI		3.14159265358979323846	/* pi */
-#define	M_PI_2		1.57079632679489661923	/* pi/2 */
-#define	M_PI_4		0.78539816339744830962	/* pi/4 */
-#define	M_1_PI		0.31830988618379067154	/* 1/pi */
-#define	M_2_PI		0.63661977236758134308	/* 2/pi */
-#define	M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
-#define	M_SQRT2		1.41421356237309504880	/* sqrt(2) */
-#define	M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
+#define M_E     2.7182818284590452354   /* e */
+#define M_LOG2E     1.4426950408889634074   /* log 2e */
+#define M_LOG10E    0.43429448190325182765  /* log 10e */
+#define M_LN2       0.69314718055994530942  /* log e2 */
+#define M_LN10      2.30258509299404568402  /* log e10 */
+#define M_PI        3.14159265358979323846  /* pi */
+#define M_PI_2      1.57079632679489661923  /* pi/2 */
+#define M_PI_4      0.78539816339744830962  /* pi/4 */
+#define M_1_PI      0.31830988618379067154  /* 1/pi */
+#define M_2_PI      0.63661977236758134308  /* 2/pi */
+#define M_2_SQRTPI  1.12837916709551257390  /* 2/sqrt(pi) */
+#define M_SQRT2     1.41421356237309504880  /* sqrt(2) */
+#define M_SQRT1_2   0.70710678118654752440  /* 1/sqrt(2) */
 
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
+#define MAXFLOAT    ((float)3.40282346638528860e+38)
 #ifdef __SYMBIAN32__
 #ifndef __WINSCW__
 extern int _signgam;
@@ -210,9 +215,9 @@
 #if __BSD_VISIBLE
 #if 0
 /* Old value from 4.4BSD-Lite math.h; this is probably better. */
-#define	HUGE		HUGE_VAL
+#define HUGE        HUGE_VAL
 #else
-#define	HUGE		MAXFLOAT
+#define HUGE        MAXFLOAT
 #endif
 #endif /* __BSD_VISIBLE */
 
@@ -226,207 +231,207 @@
  * ANSI/POSIX
  */
 #ifdef __SYMBIAN32__
-IMPORT_C double __infinite(double x);
-IMPORT_C float  __infinitef(float x);
+IMPORT_C double __infinite(double x) __SOFTFP;
+IMPORT_C float  __infinitef(float x) __SOFTFP;
 
-IMPORT_C double nanval(void );
-IMPORT_C float  nanvalf(void );
+IMPORT_C double nanval(void )__SOFTFP;
+IMPORT_C float  nanvalf(void ) __SOFTFP;
 #endif //__SYMBIAN32__
 
 
-IMPORT_C int	__fpclassifyd(double) __pure2;
-IMPORT_C int	__fpclassifyf(float) __pure2;
-IMPORT_C int	__fpclassifyl(long double) __pure2;
-IMPORT_C int	__isfinitef(float) __pure2;
-IMPORT_C int	__isfinite(double) __pure2;
-IMPORT_C int	__isfinitel(long double) __pure2;
-IMPORT_C int	__isinf(double) __pure2;
-IMPORT_C int	__isinff(float) __pure2;
-IMPORT_C int	__isinfl(long double) __pure2;
+IMPORT_C int    __fpclassifyd(double) __SOFTFP __pure2;
+IMPORT_C int    __fpclassifyf(float) __SOFTFP __pure2;
+IMPORT_C int    __fpclassifyl(long double) __SOFTFP __pure2;
+IMPORT_C int    __isfinitef(float) __SOFTFP __pure2;
+IMPORT_C int    __isfinite(double) __SOFTFP __pure2;
+IMPORT_C int    __isfinitel(long double) __SOFTFP __pure2;
+IMPORT_C int    __isinf(double) __SOFTFP __pure2;
+IMPORT_C int    __isinff(float) __SOFTFP __pure2;
+IMPORT_C int    __isinfl(long double) __SOFTFP __pure2;
 #ifdef __SYMBIAN32__
-IMPORT_C int	__isnan(double) __pure2;
-IMPORT_C int	__isnanf(float) __pure2;
+IMPORT_C int    __isnan(double) __SOFTFP __pure2;
+IMPORT_C int    __isnanf(float) __SOFTFP __pure2;
 #endif //__SYMBIAN32__
-IMPORT_C int	__isnanl(long double) __pure2;
-IMPORT_C int	__isnormalf(float) __pure2;
-IMPORT_C int	__isnormal(double) __pure2;
-IMPORT_C int	__isnormall(long double) __pure2;
-IMPORT_C int	__signbit(double) __pure2;
-IMPORT_C int	__signbitf(float) __pure2;
-IMPORT_C int	__signbitl(long double) __pure2;
+IMPORT_C int    __isnanl(long double) __SOFTFP __pure2;
+IMPORT_C int    __isnormalf(float) __SOFTFP __pure2;
+IMPORT_C int    __isnormal(double) __SOFTFP __pure2;
+IMPORT_C int    __isnormall(long double) __SOFTFP __pure2;
+IMPORT_C int    __signbit(double) __SOFTFP __pure2;
+IMPORT_C int    __signbitf(float) __SOFTFP __pure2;
+IMPORT_C int    __signbitl(long double) __SOFTFP __pure2;
 
-IMPORT_C double	acos(double);
-IMPORT_C double	asin(double);
-IMPORT_C double	atan(double);
-IMPORT_C double	atan2(double, double);
-IMPORT_C double	cos(double);
-IMPORT_C double	sin(double);
-IMPORT_C double	tan(double);
+IMPORT_C double acos(double) __SOFTFP;
+IMPORT_C double asin(double) __SOFTFP;
+IMPORT_C double atan(double) __SOFTFP;
+IMPORT_C double atan2(double, double) __SOFTFP;
+IMPORT_C double cos(double) __SOFTFP;
+IMPORT_C double sin(double) __SOFTFP;
+IMPORT_C double tan(double) __SOFTFP;
 
-IMPORT_C double	cosh(double);
-IMPORT_C double	sinh(double);
-IMPORT_C double	tanh(double);
+IMPORT_C double cosh(double) __SOFTFP;
+IMPORT_C double sinh(double) __SOFTFP;
+IMPORT_C double tanh(double) __SOFTFP;
 
-IMPORT_C double	exp(double);
-IMPORT_C double	frexp(double, int *);	/* fundamentally !__pure2 */
-IMPORT_C double	ldexp(double, int);
-IMPORT_C double	log(double);
-IMPORT_C double	log10(double);
-IMPORT_C double	modf(double, double *);	/* fundamentally !__pure2 */
+IMPORT_C double exp(double) __SOFTFP;
+IMPORT_C double frexp(double, int *) __SOFTFP;  /* fundamentally !__pure2 */
+IMPORT_C double ldexp(double, int) __SOFTFP;
+IMPORT_C double log(double) __SOFTFP;
+IMPORT_C double log10(double) __SOFTFP;
+IMPORT_C double modf(double, double *) __SOFTFP;    /* fundamentally !__pure2 */
 
-IMPORT_C double	pow(double, double);
-IMPORT_C double	sqrt(double);
+IMPORT_C double pow(double, double) __SOFTFP;
+IMPORT_C double sqrt(double) __SOFTFP;
 
-IMPORT_C double	ceil(double);
-IMPORT_C double	fabs(double) __pure2;
-IMPORT_C double	floor(double);
-IMPORT_C double	fmod(double, double);
+IMPORT_C double ceil(double) __SOFTFP;
+IMPORT_C double fabs(double) __SOFTFP __pure2;
+IMPORT_C double floor(double) __SOFTFP;
+IMPORT_C double fmod(double, double) __SOFTFP;
 
 /*
  * These functions are not in C90.
  */
 #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-IMPORT_C double	acosh(double);
-IMPORT_C double	asinh(double);
-IMPORT_C double	atanh(double);
-IMPORT_C double	cbrt(double);
-IMPORT_C double	erf(double);
-IMPORT_C double	erfc(double);
-IMPORT_C double	exp2(double);
-IMPORT_C double	expm1(double);
-IMPORT_C double	fma(double, double, double);
-IMPORT_C double	hypot(double, double);
+IMPORT_C double acosh(double) __SOFTFP;
+IMPORT_C double asinh(double) __SOFTFP;
+IMPORT_C double atanh(double) __SOFTFP;
+IMPORT_C double cbrt(double) __SOFTFP;
+IMPORT_C double erf(double) __SOFTFP;
+IMPORT_C double erfc(double) __SOFTFP;
+IMPORT_C double exp2(double) __SOFTFP;
+IMPORT_C double expm1(double) __SOFTFP;
+IMPORT_C double fma(double, double, double) __SOFTFP;
+IMPORT_C double hypot(double, double) __SOFTFP;
 
 
-IMPORT_C int	ilogb(double) __pure2;
+IMPORT_C int    ilogb(double) __SOFTFP __pure2;
 /*
-int	(isinf)(double) __pure2;
-int	(isnan)(double) __pure2;
+int (isinf)(double) __pure2;
+int (isnan)(double) __pure2;
 */
-IMPORT_C double	lgamma(double);
-IMPORT_C long long llrint(double);
-IMPORT_C long long llround(double);
-IMPORT_C double	log1p(double);
-IMPORT_C double	logb(double);
-IMPORT_C long	lrint(double);
-IMPORT_C long	lround(double);
-IMPORT_C double	nextafter(double, double);
-IMPORT_C double	remainder(double, double);
-IMPORT_C double	remquo(double, double, int *);
-IMPORT_C double	rint(double);
+IMPORT_C double lgamma(double) __SOFTFP;
+IMPORT_C long long llrint(double) __SOFTFP;
+IMPORT_C long long llround(double) __SOFTFP;
+IMPORT_C double log1p(double) __SOFTFP;
+IMPORT_C double logb(double) __SOFTFP;
+IMPORT_C long   lrint(double) __SOFTFP;
+IMPORT_C long   lround(double) __SOFTFP;
+IMPORT_C double nextafter(double, double) __SOFTFP;
+IMPORT_C double remainder(double, double) __SOFTFP;
+IMPORT_C double remquo(double, double, int *) __SOFTFP;
+IMPORT_C double rint(double) __SOFTFP;
 #endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
 
 #if __BSD_VISIBLE || __XSI_VISIBLE
-IMPORT_C double	j0(double);
-IMPORT_C double	j1(double);
-IMPORT_C double	jn(int, double);
-IMPORT_C double	scalb(double, double);
-IMPORT_C double	y0(double);
-IMPORT_C double	y1(double);
-IMPORT_C double	yn(int, double);
+IMPORT_C double j0(double) __SOFTFP;
+IMPORT_C double j1(double) __SOFTFP;
+IMPORT_C double jn(int, double) __SOFTFP;
+IMPORT_C double scalb(double, double) __SOFTFP;
+IMPORT_C double y0(double) __SOFTFP;
+IMPORT_C double y1(double) __SOFTFP;
+IMPORT_C double yn(int, double) __SOFTFP;
 
 #if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-IMPORT_C double	gamma(double);
+IMPORT_C double gamma(double) __SOFTFP;
 #endif
 #endif /* __BSD_VISIBLE || __XSI_VISIBLE */
 
 #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-IMPORT_C double	copysign(double, double) __pure2;
-IMPORT_C double	fdim(double, double);
-IMPORT_C double	fmax(double, double) __pure2;
-IMPORT_C double	fmin(double, double) __pure2;
-IMPORT_C double	nearbyint(double);
-IMPORT_C double	round(double);
-IMPORT_C double	scalbln(double, long);
-IMPORT_C double	scalbn(double, int);
-IMPORT_C double	trunc(double);
+IMPORT_C double copysign(double, double) __SOFTFP __pure2;
+IMPORT_C double fdim(double, double) __SOFTFP;
+IMPORT_C double fmax(double, double) __SOFTFP __pure2;
+IMPORT_C double fmin(double, double) __SOFTFP __pure2;
+IMPORT_C double nearbyint(double) __SOFTFP;
+IMPORT_C double round(double) __SOFTFP;
+IMPORT_C double scalbln(double, long) __SOFTFP;
+IMPORT_C double scalbn(double, int) __SOFTFP;
+IMPORT_C double trunc(double) __SOFTFP;
 #endif
 
 /*
  * BSD math library entry points
  */
 #if __BSD_VISIBLE
-IMPORT_C double	drem(double, double);
-IMPORT_C int	finite(double) __pure2;
-IMPORT_C int	isnanf(float) __pure2;
+IMPORT_C double drem(double, double) __SOFTFP;
+IMPORT_C int    finite(double) __SOFTFP __pure2;
+IMPORT_C int    isnanf(float) __SOFTFP __pure2;
 
 /*
  * Reentrant version of gamma & lgamma; passes signgam back by reference
  * as the second argument; user must allocate space for signgam.
  */
-IMPORT_C double	lgamma_r(double, int *);
+IMPORT_C double lgamma_r(double, int *) __SOFTFP;
 
 /*
  * IEEE Test Vector
  */
-IMPORT_C double	significand(double);
+IMPORT_C double significand(double) __SOFTFP;
 #endif /* __BSD_VISIBLE */
 
 /* float versions of ANSI/POSIX functions */
 #if __ISO_C_VISIBLE >= 1999
-IMPORT_C float	acosf(float);
+IMPORT_C float  acosf(float) __SOFTFP;
 
-IMPORT_C float	acosf(float);
-IMPORT_C float	asinf(float);
-IMPORT_C float	atanf(float);
-IMPORT_C float	atan2f(float, float);
-IMPORT_C float	cosf(float);
-IMPORT_C float	sinf(float);
-IMPORT_C float	tanf(float);
+IMPORT_C float  acosf(float) __SOFTFP;
+IMPORT_C float  asinf(float) __SOFTFP;
+IMPORT_C float  atanf(float) __SOFTFP;
+IMPORT_C float  atan2f(float, float) __SOFTFP;
+IMPORT_C float  cosf(float) __SOFTFP;
+IMPORT_C float  sinf(float) __SOFTFP;
+IMPORT_C float  tanf(float) __SOFTFP;
 
-IMPORT_C float	coshf(float);
-IMPORT_C float	sinhf(float);
-IMPORT_C float	tanhf(float);
-IMPORT_C float	exp2f(float);
-IMPORT_C float	expf(float);
-IMPORT_C float	expm1f(float);
-IMPORT_C float	frexpf(float, int *);	/* fundamentally !__pure2 */
-IMPORT_C int	ilogbf(float) __pure2;
+IMPORT_C float  coshf(float) __SOFTFP;
+IMPORT_C float  sinhf(float) __SOFTFP;
+IMPORT_C float  tanhf(float) __SOFTFP;
+IMPORT_C float  exp2f(float) __SOFTFP;
+IMPORT_C float  expf(float) __SOFTFP;
+IMPORT_C float  expm1f(float) __SOFTFP;
+IMPORT_C float  frexpf(float, int *) __SOFTFP;  /* fundamentally !__pure2 */
+IMPORT_C int    ilogbf(float) __SOFTFP __pure2;
 #ifndef __SYMBIAN32__
-float	ldexpf(float, int);
+float   ldexpf(float, int);
 #endif //__SYMBIAN32__
-IMPORT_C float	log10f(float);
-IMPORT_C float	log1pf(float);
-IMPORT_C float	logf(float);
-IMPORT_C float	modff(float, float *);	/* fundamentally !__pure2 */
+IMPORT_C float  log10f(float) __SOFTFP;
+IMPORT_C float  log1pf(float) __SOFTFP;
+IMPORT_C float  logf(float) __SOFTFP;
+IMPORT_C float  modff(float, float *) __SOFTFP; /* fundamentally !__pure2 */
 
-IMPORT_C float	powf(float, float);
-IMPORT_C float	sqrtf(float);
+IMPORT_C float  powf(float, float) __SOFTFP;
+IMPORT_C float  sqrtf(float) __SOFTFP;
 
-IMPORT_C float	ceilf(float);
-IMPORT_C float	fabsf(float) __pure2;
-IMPORT_C float	floorf(float);
-IMPORT_C float	fmodf(float, float);
-IMPORT_C float	roundf(float);
+IMPORT_C float  ceilf(float) __SOFTFP;
+IMPORT_C float  fabsf(float) __SOFTFP __pure2;
+IMPORT_C float  floorf(float) __SOFTFP;
+IMPORT_C float  fmodf(float, float) __SOFTFP;
+IMPORT_C float  roundf(float) __SOFTFP;
 
-IMPORT_C float	erff(float);
-IMPORT_C float	erfcf(float);
-IMPORT_C float	hypotf(float, float);
-IMPORT_C float	lgammaf(float);
+IMPORT_C float  erff(float) __SOFTFP;
+IMPORT_C float  erfcf(float) __SOFTFP;
+IMPORT_C float  hypotf(float, float) __SOFTFP;
+IMPORT_C float  lgammaf(float) __SOFTFP;
 
-IMPORT_C float	acoshf(float);
-IMPORT_C float	asinhf(float);
-IMPORT_C float	atanhf(float);
-IMPORT_C float	cbrtf(float);
-IMPORT_C float	logbf(float);
-IMPORT_C float	copysignf(float, float) __pure2;
-IMPORT_C long long llrintf(float);
-IMPORT_C long long llroundf(float);
-IMPORT_C long	lrintf(float);
-IMPORT_C long	lroundf(float);
-IMPORT_C float	nearbyintf(float);
-IMPORT_C float	nextafterf(float, float);
-IMPORT_C float	remainderf(float, float);
-IMPORT_C float	remquof(float, float, int *);
-IMPORT_C float	rintf(float);
-IMPORT_C float	scalblnf(float, long);
-IMPORT_C float	scalbnf(float, int);
-IMPORT_C float	truncf(float);
+IMPORT_C float  acoshf(float) __SOFTFP;
+IMPORT_C float  asinhf(float) __SOFTFP;
+IMPORT_C float  atanhf(float) __SOFTFP;
+IMPORT_C float  cbrtf(float) __SOFTFP;
+IMPORT_C float  logbf(float) __SOFTFP;
+IMPORT_C float  copysignf(float, float) __SOFTFP __pure2;
+IMPORT_C long long llrintf(float) __SOFTFP;
+IMPORT_C long long llroundf(float) __SOFTFP;
+IMPORT_C long   lrintf(float) __SOFTFP;
+IMPORT_C long   lroundf(float) __SOFTFP;
+IMPORT_C float  nearbyintf(float) __SOFTFP;
+IMPORT_C float  nextafterf(float, float) __SOFTFP;
+IMPORT_C float  remainderf(float, float) __SOFTFP;
+IMPORT_C float  remquof(float, float, int *) __SOFTFP;
+IMPORT_C float  rintf(float) __SOFTFP;
+IMPORT_C float  scalblnf(float, long) __SOFTFP;
+IMPORT_C float  scalbnf(float, int) __SOFTFP;
+IMPORT_C float  truncf(float) __SOFTFP;
 
-IMPORT_C float	fdimf(float, float);
-IMPORT_C float	fmaf(float, float, float);
-IMPORT_C float	fmaxf(float, float) __pure2;
-IMPORT_C float	fminf(float, float) __pure2;
+IMPORT_C float  fdimf(float, float) __SOFTFP;
+IMPORT_C float  fmaf(float, float, float) __SOFTFP;
+IMPORT_C float  fmaxf(float, float) __SOFTFP __pure2;
+IMPORT_C float  fminf(float, float) __SOFTFP __pure2;
 #endif
 
 /*
@@ -435,134 +440,134 @@
 #if __BSD_VISIBLE
 
 #ifdef __SYMBIAN_COMPILE_UNUSED__
-float	dremf(float, float);
+float   dremf(float, float);
 #endif
 
-IMPORT_C int	finitef(float) __pure2;
-IMPORT_C float	gammaf(float);
-IMPORT_C float	j0f(float);
-IMPORT_C float	j1f(float);
-IMPORT_C float	jnf(int, float);
-IMPORT_C float	scalbf(float, float);
-IMPORT_C float	y0f(float);
-IMPORT_C float	y1f(float);
-IMPORT_C float	ynf(int, float);
+IMPORT_C int    finitef(float) __SOFTFP __pure2;
+IMPORT_C float  gammaf(float) __SOFTFP;
+IMPORT_C float  j0f(float) __SOFTFP;
+IMPORT_C float  j1f(float) __SOFTFP;
+IMPORT_C float  jnf(int, float) __SOFTFP;
+IMPORT_C float  scalbf(float, float) __SOFTFP;
+IMPORT_C float  y0f(float) __SOFTFP;
+IMPORT_C float  y1f(float) __SOFTFP;
+IMPORT_C float  ynf(int, float) __SOFTFP;
 
 /*
  * Float versions of reentrant version of gamma & lgamma; passes
  * signgam back by reference as the second argument; user must
  * allocate space for signgam.
  */
-IMPORT_C float	lgammaf_r(float, int *);
+IMPORT_C float  lgammaf_r(float, int *) __SOFTFP;
 
 /*
  * float version of IEEE Test Vector
  */
-IMPORT_C float	significandf(float);
-#endif	/* __BSD_VISIBLE */
+IMPORT_C float  significandf(float) __SOFTFP;
+#endif  /* __BSD_VISIBLE */
 
 /*
  * long double versions of ISO/POSIX math functions
  */
 #if __ISO_C_VISIBLE >= 1999
 #if 0
-long double	acoshl(long double);
-long double	acosl(long double);
-long double	asinhl(long double);
-long double	asinl(long double);
-long double	atan2l(long double, long double);
-long double	atanhl(long double);
-long double	atanl(long double);
-long double	cbrtl(long double);
+long double acoshl(long double);
+long double acosl(long double);
+long double asinhl(long double);
+long double asinl(long double);
+long double atan2l(long double, long double);
+long double atanhl(long double);
+long double atanl(long double);
+long double cbrtl(long double);
 #endif
 #ifndef __SYMBIAN32__
-long double	ceill(long double);
+long double ceill(long double);
 #endif //__SYMBIAN32__
-IMPORT_C long double	copysignl(long double, long double) __pure2;
+IMPORT_C long double    copysignl(long double, long double) __SOFTFP __pure2;
 #if 0
-long double	coshl(long double);
-long double	cosl(long double);
-long double	erfcl(long double);
-long double	erfl(long double);
-long double	exp2l(long double);
-long double	expl(long double);
-long double	expm1l(long double);
+long double coshl(long double);
+long double cosl(long double);
+long double erfcl(long double);
+long double erfl(long double);
+long double exp2l(long double);
+long double expl(long double);
+long double expm1l(long double);
 #endif
-IMPORT_C long double	fabsl(long double) __pure2;
-IMPORT_C long double	fdiml(long double, long double);
+IMPORT_C long double    fabsl(long double) __SOFTFP __pure2;
+IMPORT_C long double    fdiml(long double, long double) __SOFTFP;
 #ifndef __SYMBIAN32__
-long double	floorl(long double);
-long double	fmal(long double, long double, long double);
+long double floorl(long double);
+long double fmal(long double, long double, long double);
 #endif //__SYMBIAN32__
-IMPORT_C long double	fmaxl(long double, long double) __pure2;
+IMPORT_C long double    fmaxl(long double, long double) __SOFTFP __pure2;
 #ifndef __SYMBIAN32__
-long double	fminl(long double, long double) __pure2;
+long double fminl(long double, long double) __pure2;
 #endif //__SYMBIAN32__
 #if 0
-long double	fmodl(long double, long double);
+long double fmodl(long double, long double);
 #endif
 #ifndef __SYMBIAN32__
-long double	frexpl(long double value, int *); /* fundamentally !__pure2 */
+long double frexpl(long double value, int *); /* fundamentally !__pure2 */
 #endif //__SYMBIAN32__
 #if 0
-long double	hypotl(long double, long double);
+long double hypotl(long double, long double);
 #endif
-IMPORT_C int		ilogbl(long double) __pure2;
+IMPORT_C int        ilogbl(long double) __SOFTFP __pure2;
 #ifndef __SYMBIAN32__
-long double	ldexpl(long double, int);
+long double ldexpl(long double, int);
 #endif //__SYMBIAN32__
 #if 0
-long double	lgammal(long double);
-long long	llrintl(long double);
+long double lgammal(long double);
+long long   llrintl(long double);
 #endif
 #ifndef __SYMBIAN32__
-long long	llroundl(long double);
+long long   llroundl(long double);
 #endif //__SYMBIAN32__
 #if 0
-long double	log10l(long double);
-long double	log1pl(long double);
-long double	log2l(long double);
-long double	logbl(long double);
-long double	logl(long double);
-long		lrintl(long double);
+long double log10l(long double);
+long double log1pl(long double);
+long double log2l(long double);
+long double logbl(long double);
+long double logl(long double);
+long        lrintl(long double);
 #endif
 #ifndef __SYMBIAN32__
-long		lroundl(long double);
+long        lroundl(long double);
 #endif //__SYMBIAN32__
 #if 0
-long double	modfl(long double, long double *); /* fundamentally !__pure2 */
-long double	nanl(const char *) __pure2;
-long double	nearbyintl(long double);
+long double modfl(long double, long double *); /* fundamentally !__pure2 */
+long double nanl(const char *) __pure2;
+long double nearbyintl(long double);
 #endif
 #ifndef __SYMBIAN32__
-long double	nextafterl(long double, long double);
-double		nexttoward(double, long double);
+long double nextafterl(long double, long double);
+double      nexttoward(double, long double);
 #endif //__SYMBIAN32__
-IMPORT_C float		nexttowardf(float, long double);
+IMPORT_C float      nexttowardf(float, long double) __SOFTFP;
 #ifndef __SYMBIAN32__
-long double	nexttowardl(long double, long double);
+long double nexttowardl(long double, long double);
 #endif //__SYMBIAN32__
 #if 0
-long double	powl(long double, long double);
-long double	remainderl(long double, long double);
-long double	remquol(long double, long double, int *);
-long double	rintl(long double);
+long double powl(long double, long double);
+long double remainderl(long double, long double);
+long double remquol(long double, long double, int *);
+long double rintl(long double);
 #endif
 #ifndef __SYMBIAN32__
-long double	roundl(long double);
+long double roundl(long double);
 #endif //__SYMBIAN32__
-IMPORT_C long double	scalblnl(long double, long);
+IMPORT_C long double    scalblnl(long double, long) __SOFTFP;
 #ifndef __SYMBIAN32__
-long double	scalbnl(long double, int);
+long double scalbnl(long double, int);
 #endif //__SYMBIAN32__
 #if 0
-long double	sinhl(long double);
-long double	sinl(long double);
-long double	sqrtl(long double);
-long double	tanhl(long double);
-long double	tanl(long double);
+long double sinhl(long double);
+long double sinl(long double);
+long double sqrtl(long double);
+long double tanhl(long double);
+long double tanl(long double);
 #endif
-IMPORT_C long double	truncl(long double);
+IMPORT_C long double    truncl(long double) __SOFTFP;
 
 #endif /* __ISO_C_VISIBLE >= 1999 */
 __END_DECLS
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/include/stdlib.h
--- a/genericopenlibs/openenvcore/include/stdlib.h	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/include/stdlib.h	Tue Jul 13 17:51:34 2010 +0100
@@ -49,6 +49,14 @@
 
 #include <_ansi.h>
 
+#ifdef __SYMBIAN32__
+#ifdef __WINSCW__
+#ifndef __SOFTFP
+#define __SOFTFP
+#endif /* __SOFTFP */
+#endif//__WINSCW__
+#endif//__SYMBIAN32__
+
 #if __BSD_VISIBLE
 #ifndef _RUNE_T_DECLARED
 typedef	__rune_t	rune_t;
@@ -118,7 +126,7 @@
 IMPORT_C void	 abort(void) __dead2;
 IMPORT_C int	 abs(int) __pure2;
 IMPORT_C int	 atexit(void (*)(void));
-IMPORT_C double	 atof(const char *);
+IMPORT_C double	 atof(const char *) __SOFTFP;
 IMPORT_C int	 atoi(const char *);
 IMPORT_C long	 atol(const char *);
 IMPORT_C void	*bsearch(const void *, const void *, size_t,
@@ -139,16 +147,16 @@
 IMPORT_C int	 rand(void);
 IMPORT_C void	*realloc(void *, size_t);
 IMPORT_C void	 srand(unsigned);
-IMPORT_C double	 strtod(const char * __restrict, char ** __restrict);
+IMPORT_C double	 strtod(const char * __restrict, char ** __restrict) __SOFTFP;
 
 IMPORT_C 
-float	 strtof(const char * __restrict, char ** __restrict);
+float	 strtof(const char * __restrict, char ** __restrict) __SOFTFP;
 
 IMPORT_C long	 strtol(const char * __restrict, char ** __restrict, int);
 
 IMPORT_C 
 long double
-	 strtold(const char * __restrict, char ** __restrict);
+	 strtold(const char * __restrict, char ** __restrict) __SOFTFP;
 
 IMPORT_C
 unsigned long
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/include/time.h
--- a/genericopenlibs/openenvcore/include/time.h	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/include/time.h	Tue Jul 13 17:51:34 2010 +0100
@@ -143,6 +143,11 @@
 
 __BEGIN_DECLS
 #ifdef __SYMBIAN32__
+#ifdef __WINSCW__
+#ifndef __SOFTFP
+#define __SOFTFP
+#endif /* __SOFTFP */
+#endif//__WINSCW__
 IMPORT_C char*** __tzname(void);
 #define	tzname		(*__tzname())
 #endif //__SYMBIAN32__
@@ -154,7 +159,7 @@
 IMPORT_C
 char *ctime(const time_t *);
 IMPORT_C
-double difftime(time_t, time_t);
+double difftime(time_t, time_t) __SOFTFP;
 /* XXX missing: getdate() */
 IMPORT_C
 struct tm *gmtime(const time_t *);
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/include/wchar.h
--- a/genericopenlibs/openenvcore/include/wchar.h	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/include/wchar.h	Tue Jul 13 17:51:34 2010 +0100
@@ -81,6 +81,11 @@
 #include <sys/dirent.h>
 #ifdef __SYMBIAN32__
 #include <stdarg.h>
+#ifdef __WINSCW__
+#ifndef __SOFTFP
+#define __SOFTFP
+#endif /* __SOFTFP */
+#endif//__WINSCW__
 #endif //__SYMBIAN32__
 
 #ifndef _MBSTATE_T_DECLARED
@@ -190,7 +195,7 @@
 	    __pure;
 IMPORT_C size_t	wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t);
 IMPORT_C int	wctob(wint_t);
-IMPORT_C double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
+IMPORT_C double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP;
 IMPORT_C wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,
 	    wchar_t ** __restrict);
 IMPORT_C long	 wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int);
@@ -236,9 +241,9 @@
 IMPORT_C int	vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
 	    va_list);
 IMPORT_C int	vwscanf(const wchar_t * __restrict, va_list);
-IMPORT_C float	wcstof(const wchar_t * __restrict, wchar_t ** __restrict);
+IMPORT_C float	wcstof(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP;
 IMPORT_C long double
-	wcstold(const wchar_t * __restrict, wchar_t ** __restrict);
+	wcstold(const wchar_t * __restrict, wchar_t ** __restrict) __SOFTFP;
 #ifdef __LONG_LONG_SUPPORTED
 /* LONGLONG */
 IMPORT_C long long
diff -r ddd39d92c350 -r 97e3c206731f genericopenlibs/openenvcore/libc/src/timefuncs.cpp
--- a/genericopenlibs/openenvcore/libc/src/timefuncs.cpp	Tue Jun 29 11:29:33 2010 +0100
+++ b/genericopenlibs/openenvcore/libc/src/timefuncs.cpp	Tue Jul 13 17:51:34 2010 +0100
@@ -21,8 +21,8 @@
 #include <e32cons.h>
 #include <tz.h>
 #include <tzconverter.h>
-#include "TzLocalizer.h" 
-#include "TzLocalizationDataTypes.h"
+#include "tzlocalizer.h" 
+#include "tzlocalizationdatatypes.h"
 #include "vtzrules.h"
 #include "utf.h" 
 #include "timefuncs.h"
diff -r ddd39d92c350 -r 97e3c206731f glib/glibbackend/group/glibbackend.mmp
--- a/glib/glibbackend/group/glibbackend.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/glib/glibbackend/group/glibbackend.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -63,3 +63,4 @@
 
 //end of file
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f glib/libglib/group/glib.mmp
--- a/glib/libglib/group/glib.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/glib/libglib/group/glib.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -114,3 +114,4 @@
 //VENDORID VID_DEFAULT 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f glib/libgmodule/group/gmodule.mmp
--- a/glib/libgmodule/group/gmodule.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/glib/libgmodule/group/gmodule.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -62,3 +62,4 @@
 //VENDORID VID_DEFAULT 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f glib/libgobject/group/gobject.mmp
--- a/glib/libgobject/group/gobject.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/glib/libgobject/group/gobject.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -81,3 +81,4 @@
 //VENDORID VID_DEFAULT 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f glib/libgthread/group/gthread.mmp
--- a/glib/libgthread/group/gthread.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/glib/libgthread/group/gthread.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -64,3 +64,4 @@
 //VENDORID VID_DEFAULT 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f package_definition_v2.xml
--- a/package_definition_v2.xml	Tue Jun 29 11:29:33 2010 +0100
+++ b/package_definition_v2.xml	Tue Jul 13 17:51:34 2010 +0100
@@ -136,9 +136,6 @@
       <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
         <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
       </component>
-      <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-        <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-      </component>
       <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
         <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
       </component>
diff -r ddd39d92c350 -r 97e3c206731f rom/stdlibs.iby
--- a/rom/stdlibs.iby	Tue Jun 29 11:29:33 2010 +0100
+++ b/rom/stdlibs.iby	Tue Jul 13 17:51:34 2010 +0100
@@ -48,7 +48,7 @@
 //openc Data files
 //data=\epoc32\Data\z\resource\services       RESOURCE_FILES_DIR\services
 //data=\epoc32\Data\z\resource\locales.txt    RESOURCE_FILES_DIR\locales.txt
-data=\epoc32\release\armv5\urel\pipelib.ldd    \sys\bin\pipelib.ldd
+data=KERNEL_DIR\DEBUG_DIR\pipelib.ldd    \sys\bin\pipelib.ldd
 //openc_stdlibs stub
 //data=ZSYSTEM\INSTALL\openc_stdlibs_stub.sis	    System\Install\openc_stdlibs_stub.sis
 data=ZSYSTEM\INSTALL\openc_liblogger_stub.sis 	System\Install\openc_liblogger_stub.sis
diff -r ddd39d92c350 -r 97e3c206731f ssl/libcrypto/group/libcrypto.mmp
--- a/ssl/libcrypto/group/libcrypto.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/ssl/libcrypto/group/libcrypto.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -176,3 +176,4 @@
 END
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f ssl/libssl/group/libssl.mmp
--- a/ssl/libssl/group/libssl.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/ssl/libssl/group/libssl.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -143,3 +143,4 @@
 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f stdcpp/group/libstdcpp.mmp
--- a/stdcpp/group/libstdcpp.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/stdcpp/group/libstdcpp.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -82,3 +82,4 @@
 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f stdlibs/libcrypt/group/libcrypt.mmp
--- a/stdlibs/libcrypt/group/libcrypt.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/stdlibs/libcrypt/group/libcrypt.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -70,3 +70,4 @@
 
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f stdlibs/libz/group/libz.mmp
--- a/stdlibs/libz/group/libz.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/stdlibs/libz/group/libz.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -62,3 +62,4 @@
 #endif //GCCXML
 
 SMPSAFE
+PAGED
diff -r ddd39d92c350 -r 97e3c206731f stdlibs/libz/group/libzcore.mmp
--- a/stdlibs/libz/group/libzcore.mmp	Tue Jun 29 11:29:33 2010 +0100
+++ b/stdlibs/libz/group/libzcore.mmp	Tue Jul 13 17:51:34 2010 +0100
@@ -67,3 +67,4 @@
 DEFFILE ../~/libzcore.def
 
 SMPSAFE
+PAGED