OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Drop deprecated __MSC__ macro.

Browse Source
This commit is contained in:
José Fonseca
2008-06-24 13:56:41 +09:00
parent 0d94767430
commit e8b52b3f56
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/include/pipe/p_compiler.h
View File

@@ -39,20 +39,15 @@
#define __WIN32__ #define __WIN32__
#endif #endif
#if defined(_MSC_VER) && !defined(__MSC__) #if defined(_MSC_VER)
#define __MSC__
#endif
#if defined(__MSC__)
/* Avoid 'expression is always true' warning */ /* Avoid 'expression is always true' warning */
#pragma warning(disable: 4296) #pragma warning(disable: 4296)
#endif /* __MSC__ */ #endif /* _MSC_VER */
#if defined(__MSC__) #if defined(_MSC_VER)
typedef __int8 int8_t; typedef __int8 int8_t;
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
@@ -114,7 +109,7 @@ typedef unsigned char boolean;
/* Function inlining */ /* Function inlining */
#if defined(__GNUC__) #if defined(__GNUC__)
# define INLINE __inline__ # define INLINE __inline__
#elif defined(__MSC__) #elif defined(_MSC_VER)
# define INLINE __inline # define INLINE __inline
#elif defined(__ICL) #elif defined(__ICL)
# define INLINE __inline # 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_DECL(TYPE, NAME, SIZE) TYPE NAME##___aligned[SIZE] __attribute__(( aligned( 16 ) ))
#define ALIGN16_ASSIGN(NAME) NAME##___aligned #define ALIGN16_ASSIGN(NAME) NAME##___aligned
#define ALIGN16_ATTRIB __attribute__(( aligned( 16 ) )) #define ALIGN16_ATTRIB __attribute__(( aligned( 16 ) ))

4
src/gallium/include/pipe/p_debug.h
View File

@@ -132,9 +132,9 @@ void _debug_break(void);
* Hard-coded breakpoint. * Hard-coded breakpoint.
*/ */
#ifdef DEBUG #ifdef DEBUG
#if (defined(__i386__) || defined(__386__)) && defined(__GNUC__) #if defined(PIPE_ARCH_X86) && defined(PIPE_CC_GCC)
#define debug_break() __asm("int3") #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) #define debug_break() do { _asm {int 3} } while(0)
#else #else
#define debug_break() _debug_break() #define debug_break() _debug_break()

6
src/gallium/include/pipe/p_util.h
View File

@@ -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 ) static INLINE unsigned ffs( unsigned u )
{ {
unsigned i; 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) static INLINE int iround(float f)
{ {
int r; int r;
__asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st"); __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
return r; return r;
} }
#elif defined(__MSC__) && defined(__WIN32__) #elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
static INLINE int iround(float f) static INLINE int iround(float f)
{ {
int r; int r;