diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-06-24 13:56:41 +0900 |
|---|---|---|
| committer | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-06-24 13:56:41 +0900 |
| commit | e8b52b3f5682c969e58077d42f5aebdad5d32e89 (patch) | |
| tree | e91e08f43b5e916d11daf748701e1c4c243f451b /src/gallium/include/pipe/p_compiler.h | |
| parent | 0d947674305a349662b3ab57733c54f9f4c1a8b3 (diff) | |
gallium: Drop deprecated __MSC__ macro.
Diffstat (limited to 'src/gallium/include/pipe/p_compiler.h')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 521ef2d189..d2b8c41be3 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -39,20 +39,15 @@ #define __WIN32__ #endif -#if defined(_MSC_VER) && !defined(__MSC__) -#define __MSC__ -#endif - - -#if defined(__MSC__) +#if defined(_MSC_VER) /* Avoid 'expression is always true' warning */ #pragma warning(disable: 4296) -#endif /* __MSC__ */ +#endif /* _MSC_VER */ -#if defined(__MSC__) +#if defined(_MSC_VER) typedef __int8 int8_t; typedef unsigned __int8 uint8_t; @@ -114,7 +109,7 @@ typedef unsigned char boolean; /* Function inlining */ #if defined(__GNUC__) # define INLINE __inline__ -#elif defined(__MSC__) +#elif defined(_MSC_VER) # define INLINE __inline #elif defined(__ICL) # define INLINE __inline @@ -138,7 +133,7 @@ typedef unsigned char boolean; -#if defined __GNUC__ +#if defined(__GNUC__) #define ALIGN16_DECL(TYPE, NAME, SIZE) TYPE NAME##___aligned[SIZE] __attribute__(( aligned( 16 ) )) #define ALIGN16_ASSIGN(NAME) NAME##___aligned #define ALIGN16_ATTRIB __attribute__(( aligned( 16 ) )) |