From a186c8078813b966f7860e3660045b6e79f890e9 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Apr 2006 01:52:32 +0000 Subject: updated tests for defining __FUNCTION__ (Dan Schikore) --- src/mesa/main/glheader.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 0ebadaa9fa..e37499e4be 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -247,9 +247,12 @@ * Don't define it if using a newer Windows compiler. */ #if defined(__VMS) -#define __FUNCTION__ "VMS$NL:" -#elif !(defined(__GNUC__) && __GNUC__ >= 2) && !(defined(_MSC_VER) && _MSC_VER >= 1300) -#define __FUNCTION__ "unknown" +# define __FUNCTION__ "VMS$NL:" +#elif __STDC_VERSION__ < 199901L +# if ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \ + (!defined(_MSC_VER) || _MSC_VER < 1300) +# define __FUNCTION__ "" +# endif #endif -- cgit v1.2.3