5 files changed, 11 insertions, 17 deletions
diff --git a/src/mapi/entry.c b/src/mapi/entry.c
index b6e8db28d5b..f0287a052ad 100644
--- a/src/mapi/entry.c
+++ b/src/mapi/entry.c
@@ -51,7 +51,7 @@
 
 #include <stdlib.h>
 
-static INLINE const struct mapi_table *
+static inline const struct mapi_table *
 entry_current_get(void)
 {
 #ifdef MAPI_MODE_BRIDGE
diff --git a/src/mapi/table.h b/src/mapi/table.h
index df59aed4ffd..8180db9bc10 100644
--- a/src/mapi/table.h
+++ b/src/mapi/table.h
@@ -42,7 +42,7 @@ extern const mapi_func table_noop_array[];
 /**
  * Get the no-op dispatch table.
  */
-static INLINE const struct mapi_table *
+static inline const struct mapi_table *
 table_get_noop(void)
 {
    return (const struct mapi_table *) table_noop_array;
@@ -51,7 +51,7 @@ table_get_noop(void)
 /**
  * Set the function of a slot.
  */
-static INLINE void
+static inline void
 table_set_func(struct mapi_table *tbl, int slot, mapi_func func)
 {
    mapi_func *funcs = (mapi_func *) tbl;
@@ -61,7 +61,7 @@ table_set_func(struct mapi_table *tbl, int slot, mapi_func func)
 /**
  * Return the function of a slot.
  */
-static INLINE mapi_func
+static inline mapi_func
 table_get_func(const struct mapi_table *tbl, int slot)
 {
    const mapi_func *funcs = (const mapi_func *) tbl;
diff --git a/src/mapi/u_compiler.h b/src/mapi/u_compiler.h
index f376e97a0f3..8ed0f712f5d 100644
--- a/src/mapi/u_compiler.h
+++ b/src/mapi/u_compiler.h
@@ -3,12 +3,6 @@
 
 #include "c99_compat.h" /* inline, __func__, etc. */
 
-
-/* XXX: Use standard `inline` keyword instead */
-#ifndef INLINE
-#  define INLINE inline
-#endif
-
 /* Function visibility */
 #ifndef PUBLIC
 #  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h
index 72708d433de..252e696c571 100644
--- a/src/mapi/u_current.h
+++ b/src/mapi/u_current.h
@@ -63,7 +63,7 @@ u_current_set_context(const void *ptr);
 void *
 u_current_get_context_internal(void);
 
-static INLINE const struct mapi_table *
+static inline const struct mapi_table *
 u_current_get_table(void)
 {
 #ifdef GLX_USE_TLS
@@ -74,7 +74,7 @@ u_current_get_table(void)
 #endif
 }
 
-static INLINE const void *
+static inline const void *
 u_current_get_context(void)
 {
 #ifdef GLX_USE_TLS
diff --git a/src/mapi/u_thread.h b/src/mapi/u_thread.h
index 57c3b076af8..3cd07b5c4fa 100644
--- a/src/mapi/u_thread.h
+++ b/src/mapi/u_thread.h
@@ -80,7 +80,7 @@ struct u_tsd {
 };
 
 
-static INLINE unsigned long
+static inline unsigned long
 u_thread_self(void)
 {
    /*
@@ -104,7 +104,7 @@ u_thread_self(void)
 }
 
 
-static INLINE void
+static inline void
 u_tsd_init(struct u_tsd *tsd)
 {
    if (tss_create(&tsd->key, NULL/*free*/) != 0) {
@@ -115,7 +115,7 @@ u_tsd_init(struct u_tsd *tsd)
 }
 
 
-static INLINE void *
+static inline void *
 u_tsd_get(struct u_tsd *tsd)
 {
    if (tsd->initMagic != INIT_MAGIC) {
@@ -125,7 +125,7 @@ u_tsd_get(struct u_tsd *tsd)
 }
 
 
-static INLINE void
+static inline void
 u_tsd_set(struct u_tsd *tsd, void *ptr)
 {
    if (tsd->initMagic != INIT_MAGIC) {
@@ -138,7 +138,7 @@ u_tsd_set(struct u_tsd *tsd, void *ptr)
 }
 
 
-static INLINE void
+static inline void
 u_tsd_destroy(struct u_tsd *tsd)
 {
    if (tsd->initMagic != INIT_MAGIC) {