diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 01:52:32 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-13 01:52:32 +0000 |
commit | a186c8078813b966f7860e3660045b6e79f890e9 (patch) | |
tree | 348b5c6701869ee30ed1647c84e5943e2e91f828 /src/mesa/main/glheader.h | |
parent | 09c8e41955f16592386813d23efe17bbba555d79 (diff) |
updated tests for defining __FUNCTION__ (Dan Schikore)
Diffstat (limited to 'src/mesa/main/glheader.h')
-rw-r--r-- | src/mesa/main/glheader.h | 9 |
1 files 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__ "<unknown>" +# endif #endif |