From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 24 Jun 2008 05:02:24 +0000 (+0900)
Subject: mesa: Replace deprecated __MSC__ macro.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8e50dd796a72c396bb22d414feba75c426c5e7e;p=mesa.git

mesa: Replace deprecated __MSC__ macro.
---

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 00a18d3f15d..89d0662f79e 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -333,7 +333,7 @@ static INLINE int iround(float f)
    return r;
 }
 #define IROUND(x)  iround(x)
-#elif defined(USE_X86_ASM) && defined(__MSC__) && defined(__WIN32__)
+#elif defined(USE_X86_ASM) && defined(_MSC_VER)
 static INLINE int iround(float f)
 {
    int r;
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h
index 2d1d8b18805..7abe6f2565a 100644
--- a/src/mesa/math/m_debug_util.h
+++ b/src/mesa/math/m_debug_util.h
@@ -303,7 +303,7 @@ enum { NIL = 0, ONE = 1, NEG = -1, VAR = 2 };
  */
 #if defined(__GNUC__)
 #  define ALIGN16(type, array)	type array __attribute__ ((aligned (16)))
-#elif defined(__MSC__)
+#elif defined(_MSC_VER)
 #  define ALIGN16(type, array)	type array __declspec(align(16)) /* GH: Does this work? */
 #elif defined(__WATCOMC__)
 #  define ALIGN16(type, array)	                    /* Watcom does not support this */