diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/_cstdio.h --- a/epoc32/include/stdapis/stlportv5/stl/_cstdio.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/_cstdio.h Wed Mar 31 12:33:34 2010 +0100 @@ -1,4 +1,6 @@ /* + * Portions Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. + * * Copyright (c) 1999 * Boris Fomitchev * @@ -26,11 +28,15 @@ # include _STLP_NATIVE_C_HEADER(stdio.h) #endif -#if (defined (__MWERKS__) && !defined (N_PLAT_NLM)) || defined (__BORLANDC__) +#if (defined (__MWERKS__) && !defined (N_PLAT_NLM)) || defined (__BORLANDC__) || (__SYMBIAN32__) # undef stdin # undef stdout # undef stderr -# if defined (__MWERKS__) +#if defined (__SYMBIAN32__) +# define stdin (__stdin()) +# define stdout (__stdout()) +# define stderr (__stderr()) +#elif defined (__MWERKS__) # define stdin (&_STLP_VENDOR_CSTD::__files[0]) # define stdout (&_STLP_VENDOR_CSTD::__files[1]) # define stderr (&_STLP_VENDOR_CSTD::__files[2]) @@ -74,7 +80,7 @@ using _STLP_VENDOR_CSTD::fputc; using _STLP_VENDOR_CSTD::fputs; using _STLP_VENDOR_CSTD::fread; -# if _WIN32_WCE < 0x500 // CE5 stopped supplying this +# if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this using _STLP_VENDOR_CSTD::freopen; # endif using _STLP_VENDOR_CSTD::fscanf; @@ -84,7 +90,7 @@ using _STLP_VENDOR_CSTD::fwrite; # if !(defined (__IBMCPP__) && (__IBMCPP__ >= 500)) -# if _WIN32_WCE < 0x500 // CE5 stopped supplying this except as macros. TODO: use inline function to redirect to the macros? +# if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this except as macros. TODO: use inline function to redirect to the macros? using _STLP_VENDOR_CSTD::getc; using _STLP_VENDOR_CSTD::putc; # endif @@ -93,12 +99,12 @@ # endif using _STLP_VENDOR_CSTD::gets; -# if _WIN32_WCE < 0x500 // CE5 stopped supplying this +# if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this using _STLP_VENDOR_CSTD::perror; # endif using _STLP_VENDOR_CSTD::printf; using _STLP_VENDOR_CSTD::puts; -# if _WIN32_WCE < 0x500 // CE5 stopped supplying this +# if !defined (_WIN32_WCE) || (_WIN32_WCE < 0x500) // CE5 stopped supplying this using _STLP_VENDOR_CSTD::remove; using _STLP_VENDOR_CSTD::rename; using _STLP_VENDOR_CSTD::rewind;