mesa: s/INLINE/inline/

INLINE is still seen in some files (some generated files, etc) but this
is a good start.

Acked-by: Kenneth Graunke <[email protected]>

50 files changed, 126 insertions, 126 deletions

diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 93442444979..f16378cc157 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -55,14 +55,14 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp);
 
 #include "main/compiler.h"
 
-static INLINE void
+static inline void
 _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
 {
    /* this is used in _mesa_PopAttrib */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_init_accum_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index b90d713682e..03810c69b5e 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -56,23 +56,23 @@ _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
 
 #define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)
 
-static INLINE GLboolean
+static inline GLboolean
 _ae_create_context( struct gl_context *ctx )
 {
    return GL_TRUE;
 }
 
-static INLINE void
+static inline void
 _ae_destroy_context( struct gl_context *ctx )
 {
 }
 
-static INLINE void
+static inline void
 _ae_invalidate_state( struct gl_context *ctx, GLuint new_state )
 {
 }
 
-static INLINE void
+static inline void
 _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
                               const GLvertexformat *vfmt)
 {
diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index b9af703ca73..f53b9028096 100644
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -38,7 +38,7 @@ extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
 
 #else /* FEATURE_beginend */
 
-static INLINE void
+static inline void
 _mesa_loopback_init_api_table( struct _glapi_table *dest )
 {
 }
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 83a82e86860..78f56ab00b7 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -64,7 +64,7 @@
  * non-existent.
  */
 
-static INLINE struct gl_array_object *
+static inline struct gl_array_object *
 lookup_arrayobj(struct gl_context *ctx, GLuint id)
 {
    if (id == 0)
diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h
index ade91311b01..90ada212a01 100644
--- a/src/mesa/main/atifragshader.h
+++ b/src/mesa/main/atifragshader.h
@@ -132,18 +132,18 @@ _mesa_SetFragmentShaderConstantATI(GLuint dst, const GLfloat * value);
 
 #else /* FEATURE_ATI_fragment_shader */
 
-static INLINE void
+static inline void
 _mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
 {
 }
 
-static INLINE struct ati_fragment_shader *
+static inline struct ati_fragment_shader *
 _mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)
 {
    return NULL;
 }
 
-static INLINE void
+static inline void
 _mesa_delete_ati_fragment_shader(struct gl_context *ctx,
                                  struct ati_fragment_shader *s)
 {
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index d59d31b9be9..6809311cfdb 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -52,19 +52,19 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_attrib_stack */
 
-static INLINE void
+static inline void
 _mesa_PushClientAttrib( GLbitfield mask )
 {
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_PopClientAttrib( void )
 {
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_init_attrib_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
index 9f48b3cceab..7a0704b1472 100644
--- a/src/mesa/main/bitset.h
+++ b/src/mesa/main/bitset.h
@@ -81,7 +81,7 @@
 
 /* Get first bit set in a bitset.
  */
-static INLINE int
+static inline int
 __bitset_ffs(const BITSET_WORD *x, int n)
 {
    int i;
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 99edb1adeaa..431eafd3879 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -70,7 +70,7 @@ static struct gl_buffer_object DummyBufferObject;
  * \return   pointer to pointer to the buffer object bound to \c target in the
  *           specified context or \c NULL if \c target is invalid.
  */
-static INLINE struct gl_buffer_object **
+static inline struct gl_buffer_object **
 get_buffer_target(struct gl_context *ctx, GLenum target)
 {
    switch (target) {
@@ -112,7 +112,7 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
  * \return   pointer to the buffer object bound to \c target in the
  *           specified context or \c NULL if \c target is invalid.
  */
-static INLINE struct gl_buffer_object *
+static inline struct gl_buffer_object *
 get_buffer(struct gl_context *ctx, GLenum target)
 {
    struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f82e41411b7..b4e70f2f08a 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -39,7 +39,7 @@
 
 
 /** Is the given buffer object currently mapped? */
-static INLINE GLboolean
+static inline GLboolean
 _mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
 {
    return obj->Pointer != NULL;
@@ -50,7 +50,7 @@ _mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
  * Mesa uses default buffer objects in several places.  Default buffers
  * always have Name==0.  User created buffers have Name!=0.
  */
-static INLINE GLboolean
+static inline GLboolean
 _mesa_is_bufferobj(const struct gl_buffer_object *obj)
 {
    return obj->Name != 0;
@@ -79,7 +79,7 @@ _mesa_reference_buffer_object_(struct gl_context *ctx,
                                struct gl_buffer_object **ptr,
                                struct gl_buffer_object *bufObj);
 
-static INLINE void
+static inline void
 _mesa_reference_buffer_object(struct gl_context *ctx,
                               struct gl_buffer_object **ptr,
                               struct gl_buffer_object *bufObj)
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index b0d2b5db845..4e225ffc951 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -50,7 +50,7 @@ _mesa_init_colortable_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_colortable */
 
-static INLINE void GLAPIENTRY
+static inline void GLAPIENTRY
 _mesa_ColorTable( GLenum target, GLenum internalformat,
                   GLsizei width, GLenum format, GLenum type,
                   const GLvoid *table )
@@ -58,7 +58,7 @@ _mesa_ColorTable( GLenum target, GLenum internalformat,
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void GLAPIENTRY
+static inline void GLAPIENTRY
 _mesa_ColorSubTable( GLenum target, GLsizei start,
                      GLsizei count, GLenum format, GLenum type,
                      const GLvoid *table )
@@ -66,7 +66,7 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_init_colortable_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 7dc0a48b74d..952285643b5 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -41,7 +41,7 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_convolve */
 
-static INLINE void
+static inline void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index f11dae9d07b..343feec6f57 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -560,7 +560,7 @@ make_list(GLuint name, GLuint count)
 /**
  * Lookup function to just encapsulate casting.
  */
-static INLINE struct gl_display_list *
+static inline struct gl_display_list *
 lookup_list(struct gl_context *ctx, GLuint list)
 {
    return (struct gl_display_list *)
@@ -569,7 +569,7 @@ lookup_list(struct gl_context *ctx, GLuint list)
 
 
 /** Is the given opcode an extension code? */
-static INLINE GLboolean
+static inline GLboolean
 is_ext_opcode(OpCode opcode)
 {
    return (opcode >= OPCODE_EXT_0);
@@ -1043,7 +1043,7 @@ _mesa_dlist_alloc_opcode(struct gl_context *ctx,
  * \param nparams  number of function parameters
  * \return  pointer to start of instruction space
  */
-static INLINE Node *
+static inline Node *
 alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams)
 {
    return dlist_alloc(ctx, opcode, nparams * sizeof(Node));
@@ -5672,7 +5672,7 @@ save_EdgeFlag(GLboolean x)
    save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
 }
 
-static INLINE GLboolean compare4fv( const GLfloat *a,
+static inline GLboolean compare4fv( const GLfloat *a,
                                     const GLfloat *b,
                                     GLuint count )
 {
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 160ed62f557..89008431a88 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -76,20 +76,20 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
-static INLINE void
+static inline void
 _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
 {
    /* there should be no list to delete */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_install_dlist_vtxfmt(struct _glapi_table *disp,
                            const GLvertexformat *vfmt)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_dlist_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index 31baa192ec5..13efba5f8ff 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -39,7 +39,7 @@ _mesa_init_drawpix_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_drawpix */
 
-static INLINE void
+static inline void
 _mesa_init_drawpix_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index bfeeebde54d..5a42031385a 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -91,13 +91,13 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp);
 
 #define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0)
 
-static INLINE void
+static inline void
 _mesa_install_eval_vtxfmt(struct _glapi_table *disp,
                           const GLvertexformat *vfmt)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_eval_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index fd371aba83b..139ff03da06 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -78,7 +78,7 @@ static struct gl_renderbuffer DummyRenderbuffer;
 static struct gl_framebuffer IncompleteFramebuffer;
 
 
-static INLINE GLboolean
+static inline GLboolean
 is_cube_face(GLenum target)
 {
    return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
@@ -89,7 +89,7 @@ is_cube_face(GLenum target)
 /**
  * Is the given FBO a user-created FBO?
  */
-static INLINE GLboolean
+static inline GLboolean
 is_user_fbo(const struct gl_framebuffer *fb)
 {
    return fb->Name != 0;
@@ -99,7 +99,7 @@ is_user_fbo(const struct gl_framebuffer *fb)
 /**
  * Is the given FBO a window system FBO (like an X window)?
  */
-static INLINE GLboolean
+static inline GLboolean
 is_winsys_fbo(const struct gl_framebuffer *fb)
 {
    return fb->Name == 0;
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 7eb20050209..0a70a436dea 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -50,7 +50,7 @@ _mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
 
 
 /** Return the texture image for a renderbuffer attachment */
-static INLINE struct gl_texture_image *
+static inline struct gl_texture_image *
 _mesa_get_attachment_teximage(struct gl_renderbuffer_attachment *att)
 {
    assert(att->Type == GL_TEXTURE);
@@ -59,7 +59,7 @@ _mesa_get_attachment_teximage(struct gl_renderbuffer_attachment *att)
 
 
 /** Return the (const) texture image for a renderbuffer attachment */
-static INLINE const struct gl_texture_image *
+static inline const struct gl_texture_image *
 _mesa_get_attachment_teximage_const(const struct gl_renderbuffer_attachment *att)
 {
    assert(att->Type == GL_TEXTURE);
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index d73aa08fa3d..cb5f49f67b1 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -197,7 +197,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
  * Verifies there is free space in the buffer to write the value and
  * increments the pointer.
  */
-static INLINE void
+static inline void
 write_record(struct gl_context *ctx, GLuint value)
 {
    if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 0039a0b4cb0..6d256ee8f2e 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -40,7 +40,7 @@ _mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat texcoord[4] );
 
 
-static INLINE void
+static inline void
 _mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
@@ -61,7 +61,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
 #include "main/compiler.h"
 
-static INLINE void
+static inline void
 _mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
@@ -72,21 +72,21 @@ _mesa_feedback_vertex( struct gl_context *ctx,
 }
 
 
-static INLINE void
+static inline void
 _mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    /* render mode is always GL_RENDER */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
 {
    /* render mode is always GL_RENDER */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index dadff05567e..2051f68fb54 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -34,7 +34,7 @@
  * linear RGB value in [0, 1].
  * Implemented with a 256-entry lookup table.
  */
-static INLINE GLfloat
+static inline GLfloat
 nonlinear_to_linear(GLubyte cs8)
 {
    static GLfloat table[256];
diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index b2b29a7a1db..7aef3e02bd0 100644
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -54,7 +54,7 @@ extern void
 _mesa_reference_framebuffer_(struct gl_framebuffer **ptr,
                              struct gl_framebuffer *fb);
 
-static INLINE void
+static inline void
 _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
                             struct gl_framebuffer *fb)
 {
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 72d924dcc38..4b250ad5468 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -123,7 +123,7 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
  * Lookup an entry in the hash table, without locking.
  * \sa _mesa_HashLookup
  */
-static INLINE void *
+static inline void *
 _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key)
 {
    GLuint pos;
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 577324222ca..d97e74abbad 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -48,7 +48,7 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_histogram */
 
-static INLINE void
+static inline void
 _mesa_init_histogram_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 15f7812e693..7d95dd6be37 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1756,7 +1756,7 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
 /**
  * Clip dst coords against Xmax (or Ymax).
  */
-static INLINE void
+static inline void
 clip_right_or_top(GLint *srcX0, GLint *srcX1,
                   GLint *dstX0, GLint *dstX1,
                   GLint maxValue)
@@ -1789,7 +1789,7 @@ clip_right_or_top(GLint *srcX0, GLint *srcX1,
 /**
  * Clip dst coords against Xmin (or Ymin).
  */
-static INLINE void
+static inline void
 clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
                     GLint *dstX0, GLint *dstX1,
                     GLint minValue)
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 70defdc4327..5fb5581efce 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -153,13 +153,13 @@ typedef union { GLfloat f; GLint i; } fi_type;
 #endif
 
 #if defined(_MSC_VER)
-static INLINE float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
-static INLINE float exp2f(float x) { return powf(2.0f, x); }
-static INLINE float log2f(float x) { return logf(x) * 1.442695041f; }
-static INLINE float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
-static INLINE float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
-static INLINE float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
-static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
+static inline float truncf(float x) { return x < 0.0f ? ceilf(x) : floorf(x); }
+static inline float exp2f(float x) { return powf(2.0f, x); }
+static inline float log2f(float x) { return logf(x) * 1.442695041f; }
+static inline float asinhf(float x) { return logf(x + sqrtf(x * x + 1.0f)); }
+static inline float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); }
+static inline float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; }
+static inline int isblank(int ch) { return ch == ' ' || ch == '\t'; }
 #define strtoll(p, e, b) _strtoi64(p, e, b)
 #endif
 /*@}*/
@@ -172,7 +172,7 @@ static INLINE int isblank(int ch) { return ch == ' ' || ch == '\t'; }
 /* This is pretty fast, but not accurate enough (only 2 fractional bits).
  * Based on code from http://www.stereopsis.com/log2.html
  */
-static INLINE GLfloat LOG2(GLfloat x)
+static inline GLfloat LOG2(GLfloat x)
 {
    const GLfloat y = x * x * x * x;
    const GLuint ix = *((GLuint *) &y);
@@ -184,7 +184,7 @@ static INLINE GLfloat LOG2(GLfloat x)
 /* Pretty fast, and accurate.
  * Based on code from http://www.flipcode.com/totd/
  */
-static INLINE GLfloat LOG2(GLfloat val)
+static inline GLfloat LOG2(GLfloat val)
 {
    fi_type num;
    GLint log_2;
@@ -208,7 +208,7 @@ static INLINE GLfloat LOG2(GLfloat val)
  *** IS_INF_OR_NAN: test if float is infinite or NaN
  ***/
 #ifdef USE_IEEE
-static INLINE int IS_INF_OR_NAN( float x )
+static inline int IS_INF_OR_NAN( float x )
 {
    fi_type tmp;
    tmp.f = x;
@@ -231,7 +231,7 @@ static INLINE int IS_INF_OR_NAN( float x )
  *** IS_NEGATIVE: test if float is negative
  ***/
 #if defined(USE_IEEE)
-static INLINE int GET_FLOAT_BITS( float x )
+static inline int GET_FLOAT_BITS( float x )
 {
    fi_type fi;
    fi.f = x;
@@ -289,7 +289,7 @@ static INLINE int GET_FLOAT_BITS( float x )
  *** IROUND: return (as an integer) float rounded to nearest integer
  ***/
 #if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
-static INLINE int iround(float f)
+static inline int iround(float f)
 {
    int r;
    __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
@@ -297,7 +297,7 @@ static INLINE int iround(float f)
 }
 #define IROUND(x)  iround(x)
 #elif defined(USE_X86_ASM) && defined(_MSC_VER)
-static INLINE int iround(float f)
+static inline int iround(float f)
 {
    int r;
    _asm {
@@ -344,7 +344,7 @@ long iround(float f);
  * but uses some IEEE specific tricks for better speed.
  * Contributed by Josh Vanderhoof
  */
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
 {
    int ai, bi;
    double af, bf;
@@ -357,7 +357,7 @@ static INLINE int ifloor(float f)
 }
 #define IFLOOR(x)  ifloor(x)
 #elif defined(USE_IEEE)
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
 {
    int ai, bi;
    double af, bf;
@@ -371,7 +371,7 @@ static INLINE int ifloor(float f)
 }
 #define IFLOOR(x)  ifloor(x)
 #else
-static INLINE int ifloor(float f)
+static inline int ifloor(float f)
 {
    int i = IROUND(f);
    return (i > f) ? i - 1 : i;
@@ -391,7 +391,7 @@ static INLINE int ifloor(float f)
  * but uses some IEEE specific tricks for better speed.
  * Contributed by Josh Vanderhoof
  */
-static INLINE int iceil(float f)
+static inline int iceil(float f)
 {
    int ai, bi;
    double af, bf;
@@ -404,7 +404,7 @@ static INLINE int iceil(float f)
 }
 #define ICEIL(x)  iceil(x)
 #elif defined(USE_IEEE)
-static INLINE int iceil(float f)
+static inline int iceil(float f)
 {
    int ai, bi;
    double af, bf;
@@ -417,7 +417,7 @@ static INLINE int iceil(float f)
 }
 #define ICEIL(x)  iceil(x)
 #else
-static INLINE int iceil(float f)
+static inline int iceil(float f)
 {
    int i = IROUND(f);
    return (i < f) ? i + 1 : i;
@@ -429,7 +429,7 @@ static INLINE int iceil(float f)
 /**
  * Is x a power of two?
  */
-static INLINE int
+static inline int
 _mesa_is_pow_two(int x)
 {
    return !(x & (x - 1));
@@ -449,7 +449,7 @@ _mesa_is_pow_two(int x)
  * results would be different depending on optimization
  * level used for build.
  */
-static INLINE int32_t
+static inline int32_t
 _mesa_next_pow_two_32(uint32_t x)
 {
 #if defined(__GNUC__) && \
@@ -468,7 +468,7 @@ _mesa_next_pow_two_32(uint32_t x)
 #endif
 }
 
-static INLINE int64_t
+static inline int64_t
 _mesa_next_pow_two_64(uint64_t x)
 {
 #if defined(__GNUC__) && \
@@ -495,7 +495,7 @@ _mesa_next_pow_two_64(uint64_t x)
 /*
  * Returns the floor form of binary logarithm for a 32-bit integer.
  */
-static INLINE GLuint
+static inline GLuint
 _mesa_logbase2(GLuint n)
 {
 #if defined(__GNUC__) && \
@@ -516,7 +516,7 @@ _mesa_logbase2(GLuint n)
 /**
  * Return 1 if this is a little endian machine, 0 if big endian.
  */
-static INLINE GLboolean
+static inline GLboolean
 _mesa_little_endian(void)
 {
    const GLuint ui = 1; /* intentionally not static */
diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index 25a0293703c..ab32123a403 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -211,7 +211,7 @@ mmFindBlock(struct mem_block *heap, unsigned start)
 }
 
 
-static INLINE int
+static inline int
 Join2Blocks(struct mem_block *p)
 {
    /* XXX there should be some assertions here */
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 70f33ff79b3..8c39717c6e3 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -330,7 +330,7 @@ typedef enum
  * (VERT_RESULT_PSIZ, VERT_RESULT_BFC0, VERT_RESULT_BFC1, and
  * VERT_RESULT_EDGE) are converted to a value of -1.
  */
-static INLINE int
+static inline int
 _mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)
 {
    if (vert_result >= VERT_RESULT_CLIP_DIST0)
@@ -350,7 +350,7 @@ _mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)
  * gl_frag_attrib values which have no corresponding gl_vert_result
  * (FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC) are converted to a value of -1.
  */
-static INLINE int
+static inline int
 _mesa_frag_attrib_to_vert_result(gl_frag_attrib frag_attrib)
 {
    if (frag_attrib <= FRAG_ATTRIB_TEX7)
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index 6d6ae59f463..62e352f3fc9 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -2910,35 +2910,35 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
 }
 
 
-static INLINE GLuint
+static inline GLuint
 clamp_byte_to_uint(GLbyte b)
 {
    return b < 0 ? 0 : b;
 }
 
 
-static INLINE GLuint
+static inline GLuint
 clamp_short_to_uint(GLshort s)
 {
    return s < 0 ? 0 : s;
 }
 
 
-static INLINE GLuint
+static inline GLuint
 clamp_int_to_uint(GLint i)
 {
    return i < 0 ? 0 : i;
 }
 
 
-static INLINE GLuint
+static inline GLuint
 clamp_float_to_uint(GLfloat f)
 {
    return f < 0.0F ? 0 : IROUND(f);
 }
 
 
-static INLINE GLuint
+static inline GLuint
 clamp_half_to_uint(GLhalfARB h)
 {
    GLfloat f = _mesa_half_to_float(h);
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 558b106d78c..797b0d9d624 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -60,12 +60,12 @@ _mesa_PixelTransferf(GLenum pname, GLfloat param)
 }
 
 
-static INLINE void
+static inline void
 _mesa_update_pixel(struct gl_context *ctx, GLuint newstate)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_pixel_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index 16962e55a1b..e7a133b598b 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -34,7 +34,7 @@
 
 #if FEATURE_queryobj
 
-static INLINE struct gl_query_object *
+static inline struct gl_query_object *
 _mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
 {
    return (struct gl_query_object *)
@@ -50,18 +50,18 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_queryobj */
 
-static INLINE struct gl_query_object *
+static inline struct gl_query_object *
 _mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
 {
    return NULL;
 }
 
-static INLINE void
+static inline void
 _mesa_init_query_object_functions(struct dd_function_table *driver)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index d113906f410..cdd94a66ce0 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -45,7 +45,7 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp);
 
 #else /* FEATURE_rastpos */
 
-static INLINE void
+static inline void
 _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/remap.h b/src/mesa/main/remap.h
index 5fee3005290..fa317248788 100644
--- a/src/mesa/main/remap.h
+++ b/src/mesa/main/remap.h
@@ -64,30 +64,30 @@ _mesa_init_remap_table(void);
 
 #else /* FEATURE_remap_table */
 
-static INLINE const char *
+static inline const char *
 _mesa_get_function_spec(int func_index)
 {
    return NULL;
 }
 
-static INLINE int
+static inline int
 _mesa_map_function_spec(const char *spec)
 {
    return -1;
 }
 
-static INLINE void
+static inline void
 _mesa_map_function_array(const struct gl_function_remap *func_array)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_map_static_functions(void)
 {
 }
 
 
-static INLINE void
+static inline void
 _mesa_init_remap_table(void)
 {
 }
diff --git a/src/mesa/main/renderbuffer.h b/src/mesa/main/renderbuffer.h
index f9329d55fa5..de471cd6b22 100644
--- a/src/mesa/main/renderbuffer.h
+++ b/src/mesa/main/renderbuffer.h
@@ -108,7 +108,7 @@ extern void
 _mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr,
                               struct gl_renderbuffer *rb);
 
-static INLINE void
+static inline void
 _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
                              struct gl_renderbuffer *rb)
 {
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 3ee27fb2c70..7cf0654ada2 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -313,7 +313,7 @@ validate_texture_wrap_mode(struct gl_context *ctx, GLenum wrap)
 /**
  * This is called just prior to changing any sampler object state.
  */
-static INLINE void
+static inline void
 flush(struct gl_context *ctx)
 {
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index a839010b7b9..fe7d5a7d3b6 100644
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -28,7 +28,7 @@
 
 struct dd_function_table;
 
-static INLINE struct gl_sampler_object *
+static inline struct gl_sampler_object *
 _mesa_get_samplerobj(struct gl_context *ctx, GLuint unit)
 {
    if (ctx->Texture.Unit[unit].Sampler)
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index de7c998cf0e..941841d43ee 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -98,7 +98,7 @@ extern void
 _mesa_free_shader_state(struct gl_context *ctx);
 
 
-static INLINE gl_shader_type
+static inline gl_shader_type
 _mesa_shader_type_to_index(GLenum v)
 {
    switch (v) {
@@ -115,7 +115,7 @@ _mesa_shader_type_to_index(GLenum v)
 }
 
 
-static INLINE GLenum
+static inline GLenum
 _mesa_shader_index_to_type(GLuint i)
 {
    static const GLenum enums[MESA_SHADER_TYPES] = {
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 7feeb9007ca..2b5b3d514a7 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -49,7 +49,7 @@ _mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
 /**
  * Is the secondary color needed?
  */
-static INLINE GLboolean
+static inline GLboolean
 _mesa_need_secondary_color(const struct gl_context *ctx)
 {
    if (ctx->Light.Enabled &&
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 51de9bf4809..50a5d11236f 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -82,33 +82,33 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 
 #include "main/compiler.h"
 
-static INLINE void
+static inline void
 _mesa_init_sync_object_functions(struct dd_function_table *driver)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_sync_dispatch(struct _glapi_table *disp)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_sync(struct gl_context *ctx)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_free_sync_data(struct gl_context *ctx)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    ASSERT_NO_FEATURE();
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 04c5b4476c2..8c6b1dfadc1 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -66,7 +66,7 @@
  * linear RGB value in [0, 1].
  * Implemented with a 256-entry lookup table.
  */
-static INLINE GLfloat
+static inline GLfloat
 nonlinear_to_linear(GLubyte cs8)
 {
    static GLfloat table[256];
diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h
index 709c35ae74f..23793d16722 100644
--- a/src/mesa/main/texcompress_s3tc.h
+++ b/src/mesa/main/texcompress_s3tc.h
@@ -100,7 +100,7 @@ _mesa_init_texture_s3tc(struct gl_context *ctx);
 #define _mesa_fetch_texel_2d_f_srgba_dxt3 NULL
 #define _mesa_fetch_texel_2d_f_srgba_dxt5 NULL
 
-static INLINE void
+static inline void
 _mesa_init_texture_s3tc(struct gl_context *ctx)
 {
 }
diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h
index 336ffce9245..60a9522af88 100644
--- a/src/mesa/main/texgen.h
+++ b/src/mesa/main/texgen.h
@@ -69,12 +69,12 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 {
 }
 
-static void INLINE
+static void inline
 _mesa_TexGeni( GLenum coord, GLenum pname, GLint param )
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_texgen_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 62a55dff8ba..f9118860bab 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -49,7 +49,7 @@
 /**
  * Can the given type represent negative values?
  */
-static INLINE GLboolean
+static inline GLboolean
 type_with_negative_values(GLenum type)
 {
    switch (type) {
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index daa71fd7b1a..8efe715fe97 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2253,7 +2253,7 @@ update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj,
  * changed the texture base level image, regenerate the rest of the
  * mipmap levels now.
  */
-static INLINE void
+static inline void
 check_gen_mipmap(struct gl_context *ctx, GLenum target,
                  struct gl_texture_object *texObj, GLint level)
 {
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 8ef1d4560ae..6ce0fe92cc8 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -136,7 +136,7 @@ _mesa_get_texture_dimensions(GLenum target);
 /**
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
  */
-static INLINE void
+static inline void
 _mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
@@ -144,7 +144,7 @@ _mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
    (void) texObj;
 }
 
-static INLINE void
+static inline void
 _mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    (void) texObj;
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 1faae6f7e30..9ca7a4c9e11 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -68,7 +68,7 @@ extern void
 _mesa_reference_texobj_(struct gl_texture_object **ptr,
                         struct gl_texture_object *tex);
 
-static INLINE void
+static inline void
 _mesa_reference_texobj(struct gl_texture_object **ptr,
                        struct gl_texture_object *tex)
 {
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index f232cfc8633..dc5ee33a2b2 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -180,7 +180,7 @@ set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
  * This is called just prior to changing any texture object state which
  * will not effect texture completeness.
  */
-static INLINE void
+static inline void
 flush(struct gl_context *ctx)
 {
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
@@ -195,7 +195,7 @@ flush(struct gl_context *ctx)
  * state flag and then mark the texture object as 'incomplete' so that any
  * per-texture derived state gets recomputed.
  */
-static INLINE void
+static inline void
 incomplete(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 987123036a6..7dc6dc6a2cd 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -40,7 +40,7 @@
  * Return pointer to current texture unit.
  * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
  */
-static INLINE struct gl_texture_unit *
+static inline struct gl_texture_unit *
 _mesa_get_current_tex_unit(struct gl_context *ctx)
 {
    ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index b0d5b70f2b7..9447effa928 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -110,24 +110,24 @@ _mesa_DrawTransformFeedback(GLenum mode, GLuint name);
 
 #else /* FEATURE_EXT_transform_feedback */
 
-static INLINE GLboolean
+static inline GLboolean
 _mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)
 {
    return GL_TRUE;
 }
 
-static INLINE GLboolean
+static inline GLboolean
 _mesa_validate_transform_feedback_buffers(struct gl_context *ctx)
 {
    return GL_TRUE;
 }
 
-static INLINE void
+static inline void
 _mesa_init_transform_feedback_functions(struct dd_function_table *driver)
 {
 }
 
-static INLINE void
+static inline void
 _mesa_init_transform_feedback_dispatch(struct _glapi_table *disp)
 {
 }
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 1c423200ffd..6fcc0a33627 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -41,7 +41,7 @@ struct gl_context;
  * The array->_MaxElement field will be updated.
  * Later in glDrawArrays/Elements/etc we can do some bounds checking.
  */
-static INLINE void
+static inline void
 _mesa_update_array_max_element(struct gl_client_array *array)
 {
    assert(array->Enabled);
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 8bbc54964da..aac656879bf 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -44,12 +44,12 @@ extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexfor
 
 #else /* FEATURE_beginend */
 
-static INLINE void
+static inline void
 _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }
 
-static INLINE void
+static inline void
 _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }