diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-06-25 04:05:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-06-25 04:05:11 +1000 |
| commit | b40ed6a0b54d1ba74799aeb3f529c4d298625aa1 (patch) | |
| tree | da1ae04dcd8c1db1294f3caab9ba28760ccb3f8e /src/mesa/math/m_debug_util.h | |
| parent | 95fe122f67024f55d555e2816a95409a8b53a49e (diff) | |
| parent | 0561a293b6596641c0200df7e6580599ecb8b111 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/math/m_debug_util.h')
| -rw-r--r-- | src/mesa/math/m_debug_util.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |