diff options
| -rw-r--r-- | src/mesa/main/api_arrayelt.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/compiler.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/macros.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index ebeba888357..536326f6e14 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -75,7 +75,7 @@ typedef struct { /** Cast wrapper */ -static INLINE AEcontext * +static inline AEcontext * AE_CONTEXT(struct gl_context *ctx) { return (AEcontext *) ctx->aelt_context; @@ -87,7 +87,7 @@ AE_CONTEXT(struct gl_context *ctx) * in the range [0, 7]. Luckily these type tokens are sequentially * numbered in gl.h, except for GL_DOUBLE. */ -static INLINE int +static inline int TYPE_IDX(GLenum t) { return t == GL_DOUBLE ? 7 : t & 7; diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 35160223e5b..813bf1905f5 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -151,7 +151,7 @@ extern "C" { #include <CoreFoundation/CFByteOrder.h> #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) #elif (defined(_AIX) || defined(__blrts)) -static INLINE GLuint CPU_TO_LE32(GLuint x) +static inline GLuint CPU_TO_LE32(GLuint x) { return (((x & 0x000000ff) << 24) | ((x & 0x0000ff00) << 8) | diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 0ba658a9a43..422eb5aadaa 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -189,7 +189,7 @@ static inline GLfloat UINT_AS_FLT(GLuint u) * * \param frac_bits The number of bits used to store the fractional part. */ -static INLINE uint32_t +static inline uint32_t U_FIXED(float value, uint32_t frac_bits) { value *= (1 << frac_bits); @@ -201,7 +201,7 @@ U_FIXED(float value, uint32_t frac_bits) * * \param frac_bits The number of bits used to store the fractional part. */ -static INLINE int32_t +static inline int32_t S_FIXED(float value, uint32_t frac_bits) { return (int32_t) (value * (1 << frac_bits)); |