1.1 --- a/epoc32/include/stdapis/stlportv5/mem.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/mem.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,11 +1,11 @@
     1.4  /*
     1.5 - * Copyright (c) 1999 
     1.6 + * Copyright (c) 1999
     1.7   * Boris Fomitchev
     1.8   *
     1.9   * This material is provided "as is", with absolutely no warranty expressed
    1.10   * or implied. Any use is at your own risk.
    1.11   *
    1.12 - * Permission to use or copy this software for any purpose is hereby granted 
    1.13 + * Permission to use or copy this software for any purpose is hereby granted
    1.14   * without fee, provided the above notices are retained on all copies.
    1.15   * Permission to modify the code and to distribute modified code is granted,
    1.16   * provided the above notices are retained, and a notice that the code was
    1.17 @@ -13,44 +13,43 @@
    1.18   *
    1.19   */
    1.20  
    1.21 -// Boris : highly questionable header for BC++
    1.22 -
    1.23  #ifndef _STLP_mem_h
    1.24  
    1.25 -# if !defined (_STLP_OUTERMOST_HEADER_ID)
    1.26 +#if !defined (_STLP_OUTERMOST_HEADER_ID)
    1.27  #  define _STLP_OUTERMOST_HEADER_ID 0x245
    1.28  #  include <stl/_prolog.h>
    1.29 -# elif (_STLP_OUTERMOST_HEADER_ID == 0x245) && ! defined (_STLP_DONT_POP_0x245)
    1.30 -#  define _STLP_DONT_POP_0x245
    1.31 -# endif
    1.32 -
    1.33 -# if (__BORLANDC__ > 0x530) && !defined(__linux__)
    1.34 -#  include <rw/stddefs.h>
    1.35 -# endif
    1.36 -
    1.37 -#   undef __USING_CNAME__
    1.38 -
    1.39 -#ifdef __SYMBIAN32__
    1.40 -#  include <mem.h>
    1.41 -#else
    1.42 -#  include _STLP_NATIVE_C_HEADER(mem.h)
    1.43 +#elif (_STLP_OUTERMOST_HEADER_ID == 0x245) && !defined (_STLP_DONT_POP_HEADER_ID)
    1.44 +#  define _STLP_DONT_POP_HEADER_ID
    1.45  #endif
    1.46  
    1.47 +#if (_STLP_OUTERMOST_HEADER_ID != 0x245) || defined (_STLP_DONT_POP_HEADER_ID)
    1.48 +#  include _STLP_NATIVE_C_HEADER(mem.h)
    1.49 +#else
    1.50 +#  if defined (__BORLANDC__) && defined (__USING_CNAME__)
    1.51 +#    define _USING_CNAME_WAS_UNDEFINED
    1.52 +#    undef __USING_CNAME__
    1.53 +#  endif
    1.54  
    1.55 -# define _STLP_mem_h 1
    1.56 +#  include _STLP_NATIVE_C_HEADER(mem.h)
    1.57  
    1.58 -# if (_STLP_OUTERMOST_HEADER_ID == 0x245)
    1.59 -#  if ! defined (_STLP_DONT_POP_0x245)
    1.60 -#   include <stl/_epilog.h>
    1.61 -#   undef  _STLP_OUTERMOST_HEADER_ID
    1.62 -#   endif
    1.63 -#   undef  _STLP_DONT_POP_0x245
    1.64 -# endif
    1.65 +#  if defined (__BORLANDC__) && defined (_USING_CNAME_WAS_UNDEFINED)
    1.66 +#    define __USING_CNAME__
    1.67 +#    define _STLP_mem_h 1
    1.68 +#    undef _USING_CNAME_WAS_UNDEFINED
    1.69 +#  endif
    1.70 +#endif
    1.71 +
    1.72 +#if (_STLP_OUTERMOST_HEADER_ID == 0x245)
    1.73 +#  if !defined (_STLP_DONT_POP_HEADER_ID)
    1.74 +#    include <stl/_epilog.h>
    1.75 +#    undef  _STLP_OUTERMOST_HEADER_ID
    1.76 +#  endif
    1.77 +#  undef  _STLP_DONT_POP_HEADER_ID
    1.78 +#endif
    1.79  
    1.80  #endif /* _STLP_mem_h */
    1.81  
    1.82 -// #endif /* NATIVE */
    1.83 -// Local Variables:
    1.84 -// mode:C++
    1.85 -// End:
    1.86 -
    1.87 +/* Local Variables:
    1.88 + * mode:C++
    1.89 + * End:
    1.90 + */