diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/mem.h
--- a/epoc32/include/stdapis/stlportv5/mem.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/stdapis/stlportv5/mem.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,11 +1,11 @@
 /*
- * 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
@@ -13,44 +13,43 @@
  *
  */
 
-// Boris : highly questionable header for BC++
-
 #ifndef _STLP_mem_h
 
-# if !defined (_STLP_OUTERMOST_HEADER_ID)
+#if !defined (_STLP_OUTERMOST_HEADER_ID)
 #  define _STLP_OUTERMOST_HEADER_ID 0x245
 #  include <stl/_prolog.h>
-# elif (_STLP_OUTERMOST_HEADER_ID == 0x245) && ! defined (_STLP_DONT_POP_0x245)
-#  define _STLP_DONT_POP_0x245
-# endif
-
-# if (__BORLANDC__ > 0x530) && !defined(__linux__)
-#  include <rw/stddefs.h>
-# endif
-
-#   undef __USING_CNAME__
-
-#ifdef __SYMBIAN32__
-#  include <mem.h>
-#else
-#  include _STLP_NATIVE_C_HEADER(mem.h)
+#elif (_STLP_OUTERMOST_HEADER_ID == 0x245) && !defined (_STLP_DONT_POP_HEADER_ID)
+#  define _STLP_DONT_POP_HEADER_ID
 #endif
 
+#if (_STLP_OUTERMOST_HEADER_ID != 0x245) || defined (_STLP_DONT_POP_HEADER_ID)
+#  include _STLP_NATIVE_C_HEADER(mem.h)
+#else
+#  if defined (__BORLANDC__) && defined (__USING_CNAME__)
+#    define _USING_CNAME_WAS_UNDEFINED
+#    undef __USING_CNAME__
+#  endif
 
-# define _STLP_mem_h 1
+#  include _STLP_NATIVE_C_HEADER(mem.h)
 
-# if (_STLP_OUTERMOST_HEADER_ID == 0x245)
-#  if ! defined (_STLP_DONT_POP_0x245)
-#   include <stl/_epilog.h>
-#   undef  _STLP_OUTERMOST_HEADER_ID
-#   endif
-#   undef  _STLP_DONT_POP_0x245
-# endif
+#  if defined (__BORLANDC__) && defined (_USING_CNAME_WAS_UNDEFINED)
+#    define __USING_CNAME__
+#    define _STLP_mem_h 1
+#    undef _USING_CNAME_WAS_UNDEFINED
+#  endif
+#endif
+
+#if (_STLP_OUTERMOST_HEADER_ID == 0x245)
+#  if !defined (_STLP_DONT_POP_HEADER_ID)
+#    include <stl/_epilog.h>
+#    undef  _STLP_OUTERMOST_HEADER_ID
+#  endif
+#  undef  _STLP_DONT_POP_HEADER_ID
+#endif
 
 #endif /* _STLP_mem_h */
 
-// #endif /* NATIVE */
-// Local Variables:
-// mode:C++
-// End:
-
+/* Local Variables:
+ * mode:C++
+ * End:
+ */