1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_cstdio.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_cstdio.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,4 +1,6 @@
     1.4  /*
     1.5 + * Portions Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
     1.6 + *
     1.7   * Copyright (c) 1999
     1.8   * Boris Fomitchev
     1.9   *
    1.10 @@ -26,11 +28,15 @@
    1.11  #  include _STLP_NATIVE_C_HEADER(stdio.h)
    1.12  #endif
    1.13  
    1.14 -#if (defined (__MWERKS__) && !defined (N_PLAT_NLM))  || defined (__BORLANDC__)
    1.15 +#if (defined (__MWERKS__) && !defined (N_PLAT_NLM))  || defined (__BORLANDC__) || (__SYMBIAN32__)
    1.16  #  undef stdin
    1.17  #  undef stdout
    1.18  #  undef stderr
    1.19 -#  if defined (__MWERKS__)
    1.20 +#if defined (__SYMBIAN32__)
    1.21 +#  define stdin   (__stdin())
    1.22 +#  define stdout  (__stdout())
    1.23 +#  define stderr  (__stderr())
    1.24 +#elif defined (__MWERKS__)
    1.25  #  define stdin   (&_STLP_VENDOR_CSTD::__files[0])
    1.26  #  define stdout  (&_STLP_VENDOR_CSTD::__files[1])
    1.27  #  define stderr  (&_STLP_VENDOR_CSTD::__files[2])
    1.28 @@ -74,7 +80,7 @@
    1.29  using _STLP_VENDOR_CSTD::fputc;
    1.30  using _STLP_VENDOR_CSTD::fputs;
    1.31  using _STLP_VENDOR_CSTD::fread;
    1.32 -#    if _WIN32_WCE < 0x500 // CE5 stopped supplying this
    1.33 +#    if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this
    1.34  using _STLP_VENDOR_CSTD::freopen;
    1.35  #    endif
    1.36  using _STLP_VENDOR_CSTD::fscanf;
    1.37 @@ -84,7 +90,7 @@
    1.38  using _STLP_VENDOR_CSTD::fwrite;
    1.39  
    1.40  #    if  !(defined (__IBMCPP__) && (__IBMCPP__ >= 500))
    1.41 -#      if _WIN32_WCE < 0x500 // CE5 stopped supplying this except as macros. TODO: use inline function to redirect to the macros?
    1.42 +#      if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this except as macros. TODO: use inline function to redirect to the macros?
    1.43   using _STLP_VENDOR_CSTD::getc;
    1.44   using _STLP_VENDOR_CSTD::putc;
    1.45  #      endif
    1.46 @@ -93,12 +99,12 @@
    1.47  #    endif
    1.48  
    1.49  using _STLP_VENDOR_CSTD::gets;
    1.50 -#    if _WIN32_WCE < 0x500 // CE5 stopped supplying this
    1.51 +#    if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this
    1.52  using _STLP_VENDOR_CSTD::perror;
    1.53  #    endif
    1.54  using _STLP_VENDOR_CSTD::printf;
    1.55  using _STLP_VENDOR_CSTD::puts;
    1.56 -#    if _WIN32_WCE < 0x500 // CE5 stopped supplying this
    1.57 +#    if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this
    1.58  using _STLP_VENDOR_CSTD::remove;
    1.59  using _STLP_VENDOR_CSTD::rename;
    1.60  using _STLP_VENDOR_CSTD::rewind;