summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-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 ebdfc452a7..813be52e4e 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -332,7 +332,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 f7ce4679b6..776c26475e 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 */