From 7ac6bf4b962aa9ec19b8ddb16d1c588467f05de7 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 1 Dec 2003 11:49:23 +0000
Subject: [PATCH] Another patch for the new 6.0 compiler.

[SVN r21034]
---
 include/boost/config/compiler/borland.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 7ffb1cd7..14923c77 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -105,16 +105,20 @@
 //
 // all versions support __declspec:
 //
-#define BOOST_HAS_DECLSPEC
+#ifndef __STRICT_ANSI__
+#  define BOOST_HAS_DECLSPEC
+#endif
 //
 // ABI fixing headers:
 //
+#if __BORLANDC__ < 0x600 // not implemented for version 6 compiler yet
 #ifndef BOOST_ABI_PREFIX
 #  define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp"
 #endif
 #ifndef BOOST_ABI_SUFFIX
 #  define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp"
 #endif
+#endif
 //
 // Disable Win32 support in ANSI mode:
 //