[Mesa-dev] [PATCH 1/7] mapi: remove u_macros.h

[Brian Paul]

Only U_STRINGIFY() is used in entry.c
---
 src/mapi/Makefile.sources   |  1 -
 src/mapi/entry.c            |  4 +++-
 src/mapi/entry_x86-64_tls.h |  1 -
 src/mapi/entry_x86_tls.h    |  1 -
 src/mapi/entry_x86_tsd.h    |  1 -
 src/mapi/u_macros.h         | 12 ------------
 6 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 src/mapi/u_macros.h

diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources
index a179662..4e92f5e 100644
--- 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 f0287a0..27d0db4 100644
--- 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 d571df9..5c03b04 100644
--- a/src/mapi/entry_x86-64_tls.h
+++ b/src/mapi/entry_x86-64_tls.h
@@ -25,7 +25,6 @@
  *    Chia-I Wu <olv at 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 df31dce..46d2ece 100644
--- 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 ece00fa..ea7bacb 100644
--- a/src/mapi/entry_x86_tsd.h
+++ b/src/mapi/entry_x86_tsd.h
@@ -25,7 +25,6 @@
  *    Chia-I Wu <olv at 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
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_ */
-- 
1.9.1