Index: stlport.hpp =================================================================== --- stlport.hpp (revision 70956) +++ stlport.hpp (working copy) @@ -150,7 +150,9 @@ #elif defined(__BORLANDC__) && __BORLANDC__ < 0x560 // STLport doesn't import std::abs correctly: #include +#if defined(__cplusplus) namespace std { using ::abs; } +#endif // and strcmp/strcpy don't get imported either ('cos they are macros) #include #ifdef strcpy @@ -159,7 +161,7 @@ #ifdef strcmp # undef strcmp #endif -#ifdef _STLP_VENDOR_CSTD +#ifdef _STLP_VENDOR_CSTD && defined(__cplusplus) namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy; } #endif #endif