Define __FUNCTION__ as a preprocessor symbol in glheader.h if we're not

using GCC or VMS.

2 files changed, 11 insertions, 4 deletions

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index abb858638eb..a4dff0fe7f7 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -285,6 +285,17 @@ int INLINE ffs(int value)
 }
 #endif
 
+
+/* The __FUNCTION__ gcc variable is generally only used for debugging.
+ * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
+ */
+#if defined(__VMS)
+#define __FUNCTION__ "VMS$NL:"
+#elif !(defined(__GNUC__) && __GNUC__ >= 2)
+#define __FUNCTION__ "unknown"
+#endif
+
+
 #include "config.h"
 
 #endif /* GLHEADER_H */
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 603da765b4a..74ab9a68928 100644
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -519,10 +519,6 @@ static void emit_op3fn(struct tnl_program *p,
    debug_insn(inst, fn, line);
 }
 
-   
-#ifdef __VMS
-#define __FUNCTION__ "VMS$NL:"
-#endif
 
 #define emit_op3(p, op, dst, mask, src0, src1, src2) \
    emit_op3fn(p, op, dst, mask, src0, src1, src2, __FUNCTION__, __LINE__)