From e2a3cb0214208e73d73f07bd4d7ea53a8d15b285 Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Sun, 29 Jan 2006 17:06:32 +0000
Subject: [PATCH] - Fix CGAL_PRETTY_FUNCTION for compilers which are !VC++,
 !GCC, !Sun   (the default MUST be the standard __func__). - Some formatting.

---
 Packages/Configuration/include/CGAL/config.h | 21 +++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Packages/Configuration/include/CGAL/config.h b/Packages/Configuration/include/CGAL/config.h
index 02eae0a43b2..241dc65a72b 100644
--- a/Packages/Configuration/include/CGAL/config.h
+++ b/Packages/Configuration/include/CGAL/config.h
@@ -121,12 +121,10 @@ namespace CGAL {
 
 #ifdef _MSC_VER
 #  include <CGAL/MSVC_standard_header_fixes.h>
-#endif
-#if defined(__BORLANDC__) && __BORLANDC__ > 0x520
-#include <CGAL/Borland_fixes.h>
-#endif
-#if defined(__sun) && defined(__SUNPRO_CC)
-#include <CGAL/Sun_fixes.h>
+#elif defined(__BORLANDC__) && __BORLANDC__ > 0x520
+#  include <CGAL/Borland_fixes.h>
+#elif defined(__sun) && defined(__SUNPRO_CC)
+#  include <CGAL/Sun_fixes.h>
 #endif
 
 //--------------------------------------------------------------------//
@@ -159,14 +157,13 @@ using std::max;
 
 
 //-------------------------------------------------------------------//
-// In profiling messages we want trace in which function we are
-// Different compilers provide different macros for that
+// Compilers provide different macros to access the current function name
 #ifdef _MSC_VER
-#define CGAL_PRETTY_FUNCTION __FUNCSIG__
-#elif defined(__sun) && defined(__SUNPRO_CC)
-#define CGAL_PRETTY_FUNCTION __func__
+#  define CGAL_PRETTY_FUNCTION __FUNCSIG__
+#elif defined __GNUG__
+#  define CGAL_PRETTY_FUNCTION __PRETTY_FUNCTION__
 #else 
-#define CGAL_PRETTY_FUNCTION __PRETTY_FUNCTION__
+#  define CGAL_PRETTY_FUNCTION __func__
 #endif
 
 #endif // CGAL_CONFIG_H