gallium: Drop deprecated __MSC__ macro.
This commit is contained in:
parent
0d94767430
commit
e8b52b3f56
|
@ -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 ) ))
|
||||
|
|
|
@ -132,9 +132,9 @@ void _debug_break(void);
|
|||
* Hard-coded breakpoint.
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
#if (defined(__i386__) || defined(__386__)) && defined(__GNUC__)
|
||||
#if defined(PIPE_ARCH_X86) && defined(PIPE_CC_GCC)
|
||||
#define debug_break() __asm("int3")
|
||||
#elif defined(_M_IX86) && defined(_MSC_VER)
|
||||
#elif defined(PIPE_ARCH_X86) && defined(PIPE_CC_MSVC)
|
||||
#define debug_break() do { _asm {int 3} } while(0)
|
||||
#else
|
||||
#define debug_break() _debug_break()
|
||||
|
|
|
@ -224,7 +224,7 @@ static INLINE int align_int(int x, int align)
|
|||
|
||||
|
||||
|
||||
#if defined(__MSC__) && defined(__WIN32__)
|
||||
#if defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
|
||||
static INLINE unsigned ffs( unsigned u )
|
||||
{
|
||||
unsigned i;
|
||||
|
@ -341,14 +341,14 @@ static INLINE int ifloor(float f)
|
|||
}
|
||||
|
||||
|
||||
#if defined(__GNUC__) && defined(__i386__)
|
||||
#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)
|
||||
static INLINE int iround(float f)
|
||||
{
|
||||
int r;
|
||||
__asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
|
||||
return r;
|
||||
}
|
||||
#elif defined(__MSC__) && defined(__WIN32__)
|
||||
#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
|
||||
static INLINE int iround(float f)
|
||||
{
|
||||
int r;
|
||||
|
|
Loading…
Reference in New Issue