From: Karl Schultz <kschultz@freedesktop.org>
Date: Fri, 1 Jul 2005 20:11:46 +0000 (+0000)
Subject: Don't #define __FUNCTION__ on a Microsoft C compiler new enough to have it.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eac76882315a576a91b26b84f06144d3c8083758;p=mesa.git

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 a4dff0fe7f7..d1acd9ef81f 100644
--- 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