From 224e97fbb62f50047a4903e5c51e31133fff7b17 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Tue, 16 Jul 2002 11:18:02 +0000
Subject: [PATCH] Fixed support for C++ Builder 5 + STLport.

[SVN r14476]
---
 include/boost/config/stdlib/stlport.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp
index d97f3160..2260bf43 100644
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -83,13 +83,17 @@
 //
 // Harold Howe says:
 // Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with
-// BCB6 does cause problems. If we detect BCB6, then don't define 
+// BCB6 does cause problems. If we detect C++ Builder, then don't define 
 // BOOST_NO_STDC_NAMESPACE
 //
-#if !defined(__BORLANDC__) || (__BORLANDC__ < 0x560)
+#if !defined(__BORLANDC__)
 #  if defined(__STL_IMPORT_VENDOR_CSTD) || defined(__STL_USE_OWN_NAMESPACE) || defined(_STLP_IMPORT_VENDOR_CSTD) || defined(_STLP_USE_OWN_NAMESPACE)
 #     define BOOST_NO_STDC_NAMESPACE
 #  endif
+#elif __BORLANDC__ < 0x560
+// STLport doesn't import std::abs correctly:
+#include <stdlib.h>
+namespace std { using ::abs; }
 #endif
 
 //
@@ -126,3 +130,4 @@
 
 
 
+