summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-24 14:02:24 +0900
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-21 22:13:56 -0700
commitf8e50dd796a72c396bb22d414feba75c426c5e7e (patch)
tree54189612fc5180b70659aafb2e1683ad5d60a8f2 /src
parent60325331a8a76f3c783284c65b81cee471d7d64c (diff)
mesa: Replace deprecated __MSC__ macro.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/imports.h2
-rw-r--r--src/mesa/math/m_debug_util.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 00a18d3f15..89d0662f79 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 2d1d8b1880..7abe6f2565 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 */