diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/memory --- a/epoc32/include/stdapis/stlportv5/memory Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/memory Wed Mar 31 12:33:34 2010 +0100 @@ -2,13 +2,13 @@ * Copyright (c) 1997-1999 * Silicon Graphics Computer Systems, Inc. * - * Copyright (c) 1999 + * Copyright (c) 1999 * Boris Fomitchev * * This material is provided "as is", with absolutely no warranty expressed * or implied. Any use is at your own risk. * - * Permission to use or copy this software for any purpose is hereby granted + * Permission to use or copy this software for any purpose is hereby granted * without fee, provided the above notices are retained on all copies. * Permission to modify the code and to distribute modified code is granted, * provided the above notices are retained, and a notice that the code was @@ -17,50 +17,50 @@ */ #ifndef _STLP_MEMORY -# define _STLP_MEMORY +#define _STLP_MEMORY -# ifndef _STLP_OUTERMOST_HEADER_ID +#ifndef _STLP_OUTERMOST_HEADER_ID # define _STLP_OUTERMOST_HEADER_ID 0x46 # include -# endif +#endif -# ifdef _STLP_PRAGMA_ONCE +#ifdef _STLP_PRAGMA_ONCE # pragma once -# endif +#endif -# ifndef _STLP_INTERNAL_ALLOC_H +#ifndef _STLP_INTERNAL_ALLOC_H # include -# endif +#endif -# ifndef _STLP_INTERNAL_TEMPBUF_H +#ifndef _STLP_INTERNAL_TEMPBUF_H # include -# endif +#endif -# ifndef _STLP_INTERNAL_RAW_STORAGE_ITER_H +#ifndef _STLP_INTERNAL_RAW_STORAGE_ITER_H # include -# endif +#endif -# include +#include -# if defined (_STLP_IMPORT_VENDOR_STD) +#if defined (_STLP_IMPORT_VENDOR_STD) # if defined (__MSL__) -# include _STLP_NATIVE_HEADER(limits) +# include _STLP_NATIVE_HEADER(limits) # endif # include _STLP_NATIVE_HEADER(memory) -# if defined (__MSL__) && (__MSL__ >= 0x2405 && __MSL__ < 0x5201) -/* 980401 vss MSL 2.4 Pro 3 Release */ -# include +# if defined (__MSL__) && (__MSL__ >= 0x2405 && __MSL__ < 0x5201) +/* 980401 vss MSL 2.4 Pro 3 Release */ +# include # endif -# endif +#endif -# if (_STLP_OUTERMOST_HEADER_ID == 0x46) +#if (_STLP_OUTERMOST_HEADER_ID == 0x46) # include # undef _STLP_OUTERMOST_HEADER_ID -# endif +#endif #endif /* _STLP_MEMORY */