1.1 --- a/epoc32/include/stdapis/stlportv5/stl/config/_mwerks.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/config/_mwerks.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -4,20 +4,27 @@
     1.4  #define _STLP_COMPILER "Metrowerk Codewarrior"
     1.5  
     1.6  // Bring in definition of __MSL__ and related items
     1.7 -#include <mslGlobals.h>
     1.8 +#ifndef __SYMBIAN32__
     1.9 +#include <mslglobals.h>
    1.10  #include <ansi_parms.h>
    1.11 -
    1.12 +#endif
    1.13  //
    1.14  //  Compiler features
    1.15  //
    1.16  
    1.17  
    1.18  // *** CodeWarrior Compiler Common Features ***
    1.19 +#ifdef __SYMBIAN32__
    1.20 +//The following macro is defined so that the vendor's APIs dont get picked. Rather the ones from PIPS are used.
    1.21 +#  define _STLP_NO_VENDOR_STDLIB_L  1
    1.22 +#endif // __SYMBAIN32__
    1.23  #  if __option(longlong)
    1.24  #   define _STLP_LONG_LONG  long long
    1.25  #  endif
    1.26  
    1.27 +#ifndef __SYMBIAN32__
    1.28  #  define _STLP_USE_UNIX_EMULATION_IO  1
    1.29 +#endif
    1.30  
    1.31  #  define _STLP_USE_AUTO_PTR_CONVERSIONS  1
    1.32  
    1.33 @@ -112,7 +119,7 @@
    1.34  
    1.35  #  endif
    1.36  
    1.37 -
    1.38 +#ifndef __SYMBIAN32__
    1.39  // fixes to native inclusion wrappers.
    1.40  # if __MWERKS__ >= 0x2300  // CWPro5 changes paths - dwa 2/28/99
    1.41  #  define _STLP_NATIVE_INCLUDE_PATH  ../include
    1.42 @@ -131,7 +138,7 @@
    1.43  #  define _STLP_NATIVE_CPP_RUNTIME_HEADER(header) <Macintosh HD:Codewarrior Pro 4:Metrowerks CodeWarrior:Metrowerks Standard Library:MSL C:MSL Common:Public Includes:##header>
    1.44  
    1.45  # endif
    1.46 -
    1.47 +#endif //if __SYMBIAN32__
    1.48  //Following block come from boost intrinsics.hpp file:
    1.49  #if defined (__MSL_CPP__) && (__MSL_CPP__ >= 0x8000)
    1.50      // Metrowerks compiler is acquiring intrinsic type traits support
    1.51 @@ -158,4 +165,6 @@
    1.52  # elif defined(macintosh)
    1.53  #  define _NOTHREADS
    1.54  # endif
    1.55 +#ifndef __SYMBIAN32__
    1.56  # define _STLP_DLLEXPORT_NEEDS_PREDECLARATION 1
    1.57 +#endif // __SYMBIAN32__