Don't #define __FUNCTION__ on a Microsoft C compiler new enough to have it.

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index a4dff0fe7f70c524c31a20db80bde622c58692dc..d1acd9ef81f36bfc86d45f8dd3227a063e9779ce 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -288,10 +288,11 @@ int INLINE ffs(int value)
 
 /* The __FUNCTION__ gcc variable is generally only used for debugging.
  * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
+ * Don't define it if using a newer Windows compiler.
  */
 #if defined(__VMS)
 #define __FUNCTION__ "VMS$NL:"
-#elif !(defined(__GNUC__) && __GNUC__ >= 2)
+#elif !(defined(__GNUC__) && __GNUC__ >= 2) && !(defined(_MSC_VER) && _MSC_VER >= 1300)
 #define __FUNCTION__ "unknown"
 #endif