\r
// Author: Andy Rushton\r
// Copyright: (c) Southampton University 1999-2004\r
-// (c) Andy Rushton 2004-2009\r
+// (c) Andy Rushton 2004 onwards\r
// License: BSD License, see ../docs/license.html\r
\r
// Set of simple debug utilities, all of which are switched off by the\r
////////////////////////////////////////////////////////////////////////////////\r
// Problem with missing __FUNCTION__ macro\r
////////////////////////////////////////////////////////////////////////////////\r
-// this macro is used in debugging but was missing in Visual Studio prior to version 7\r
-// it also has a different name in Borland\r
\r
+// this macro is used in debugging but was missing in Visual Studio prior to version 7\r
#if defined(_MSC_VER) && (_MSC_VER < 1300)\r
#define __FUNCTION__ 0\r
#endif\r
\r
-#ifdef __BORLANDC__\r
+// old versions of Borland compiler defined a macro __FUNC__ but more recent ones define __FUNCTION__\r
+// I'm not sure at what version this change was made - assumed C++ Builder 6.32\r
+#if defined(__BORLANDC__) && (__BORLANDC__ < 1585)\r
#define __FUNCTION__ __FUNC__\r
#endif\r
\r