mapi: remove u_macros.h

Only U_STRINGIFY() is used in entry.c

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: José Fonseca <jfonseca@vmware.com>

diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
index a1796626d5ea96ee3641d15ea4afdecc36f2dc70..4e92f5edfeb187e254f7b67b44c41ea92a44e3ed 100644 (file)
--- a/src/mapi/Makefile.sources
+++ b/src/mapi/Makefile.sources
@@ -19,7 +19,6 @@ MAPI_UTIL_FILES = \
        u_current.h \
        u_execmem.c \
        u_execmem.h \
-       u_macros.h \
        u_thread.h
 
 MAPI_BRIDGE_FILES = \

diff --git a/src/mapi/entry.c b/src/mapi/entry.c
index f0287a052ad24d76010308ad584e36cf663f09b4..27d0db40efce3158bf93c29e9b5e1a6ef0a88f40 100644 (file)
--- a/src/mapi/entry.c
+++ b/src/mapi/entry.c
@@ -27,7 +27,9 @@
 
 #include "entry.h"
 #include "u_current.h"
-#include "u_macros.h"
+
+#define _U_STRINGIFY(x) #x
+#define U_STRINGIFY(x) _U_STRINGIFY(x)
 
 /* define macros for use by assembly dispatchers */
 #define ENTRY_CURRENT_TABLE U_STRINGIFY(u_current_table)

diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h
index d571df97433a1dce12f103233de3260441248fd6..5c03b045606c484547dd1c7624ce7e57498fb431 100644 (file)
--- a/src/mapi/entry_x86-64_tls.h
+++ b/src/mapi/entry_x86-64_tls.h
@@ -25,7 +25,6 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#include "u_macros.h"
 
 __asm__(".text\n"
         ".balign 32\n"

diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h
index df31dce55f1ba385d7c5f6ef9454ca62f57662c0..46d2eced24f87678c8ab781858e5d87ec3bbff15 100644 (file)
--- a/src/mapi/entry_x86_tls.h
+++ b/src/mapi/entry_x86_tls.h
@@ -26,7 +26,6 @@
  */
 
 #include <string.h>
-#include "u_macros.h"
 
 __asm__(".text");
 

diff --git a/src/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h
index ece00fac0b75743449bf9b4f65d39728d47dce6c..ea7bacb43e48c071bb6443c54f065dbaa2cc61ce 100644 (file)
--- a/src/mapi/entry_x86_tsd.h
+++ b/src/mapi/entry_x86_tsd.h
@@ -25,7 +25,6 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#include "u_macros.h"
 
 #define X86_ENTRY_SIZE 32
 

diff --git a/src/mapi/u_macros.h b/src/mapi/u_macros.h
deleted file mode 100644 (file)
index 72345b5..0000000
--- a/src/mapi/u_macros.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _U_MACROS_
-#define _U_MACROS_
-
-#define _U_STRINGIFY(x) #x
-#define _U_CONCAT(x, y) x ## y
-#define _U_CONCAT_STR(x, y) #x#y
-
-#define U_STRINGIFY(x) _U_STRINGIFY(x)
-#define U_CONCAT(x, y) _U_CONCAT(x, y)
-#define U_CONCAT_STR(x, y) _U_CONCAT_STR(x, y)
-
-#endif /* _U_MACROS_ */