diff -r ce057bb09d0b -r 5fae379060a7 ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h --- a/ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h Fri Jun 04 16:20:51 2010 +0100 +++ b/ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h Fri Jun 11 15:26:22 2010 +0300 @@ -15,6 +15,9 @@ * */ +#ifndef _STLP_NEW_H +#define _STLP_NEW_H + # if !defined (_STLP_OUTERMOST_HEADER_ID) # define _STLP_OUTERMOST_HEADER_ID 0x848 # include @@ -22,11 +25,7 @@ # define _STLP_DONT_POP_0x848 # endif -#ifndef _STLP_NEW_H -#define _STLP_NEW_H - - -# if (!(defined( _STLP_WINCE ) || defined (__SYMBIAN32__)) +# if (!(defined( _STLP_WINCE ) || defined (__SYMBIAN32__))) # if defined (__BORLANDC__) # include # elif (__INTEL_COMPILER >= 800) @@ -40,8 +39,6 @@ # endif # endif /* STL_WINCE */ -#endif //_STLP_NEW_H - # if (_STLP_OUTERMOST_HEADER_ID == 0x848) # if ! defined (_STLP_DONT_POP_0x848) # include @@ -50,6 +47,8 @@ # undef _STLP_DONT_POP_0x848 # endif +#endif //_STLP_NEW_H + // Local Variables: // mode:C++ // End: