mapi: remove u_compiler.h

Just include c99_compat.h or util/macros.h where needed.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

src/mapi/Makefile.sources

@@ -15,7 +15,6 @@
 #    this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined.
 
 MAPI_UTIL_FILES = \
-	u_compiler.h \
 	u_current.c \
 	u_current.h \
 	u_execmem.c \

src/mapi/entry.h

@@ -28,7 +28,6 @@
 #ifndef _ENTRY_H_
 #define _ENTRY_H_
 
-#include "u_compiler.h"
 
 typedef void (*mapi_func)(void);
 

src/mapi/glapi/glapi.h

@@ -44,6 +44,7 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
+#include "util/macros.h"
 #include "u_thread.h"
 
 

src/mapi/mapi.h

@@ -28,8 +28,6 @@
 #ifndef _MAPI_H_
 #define _MAPI_H_
 
-#include "u_compiler.h"
-
 #ifdef _WIN32
 #ifdef MAPI_DLL_EXPORTS
 #define MAPI_EXPORT __declspec(dllexport)

src/mapi/table.h

@@ -28,7 +28,7 @@
 #ifndef _TABLE_H_
 #define _TABLE_H_
 
-#include "u_compiler.h"
+#include "c99_compat.h"
 #include "entry.h"
 
 #define MAPI_TMP_TABLE
@@ -37,6 +37,8 @@
 #define MAPI_TABLE_NUM_SLOTS (MAPI_TABLE_NUM_STATIC + MAPI_TABLE_NUM_DYNAMIC)
 #define MAPI_TABLE_SIZE (MAPI_TABLE_NUM_SLOTS * sizeof(mapi_func))
 
+struct mapi_table;
+
 extern const mapi_func table_noop_array[];
 
 /**

src/mapi/u_compiler.h

@@ -1,7 +0,0 @@
-#ifndef _U_COMPILER_H_
-#define _U_COMPILER_H_
-
-#include "c99_compat.h" /* inline, __func__, etc. */
-#include "util/macros.h"
-
-#endif /* _U_COMPILER_H_ */

src/mapi/u_current.h

@@ -1,6 +1,10 @@
 #ifndef _U_CURRENT_H_
 #define _U_CURRENT_H_
 
+#include "c99_compat.h"
+#include "util/macros.h"
+
+
 #if defined(MAPI_MODE_UTIL) || defined(MAPI_MODE_GLAPI) || \
     defined(MAPI_MODE_BRIDGE)
 
@@ -24,8 +28,6 @@
 
 #else /* MAPI_MODE_UTIL || MAPI_MODE_GLAPI || MAPI_MODE_BRIDGE */
 
-#include "u_compiler.h"
-
 struct mapi_table;
 
 #ifdef GLX_USE_TLS

src/mapi/u_execmem.c

@@ -32,7 +32,7 @@
  */
 
 
-#include "u_compiler.h"
+#include "c99_compat.h"
 #include "u_thread.h"
 #include "u_execmem.h"
 

src/mapi/u_thread.h

@@ -44,7 +44,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "u_compiler.h"
+#include "c99_compat.h"
 
 #include "c11/threads.h"