diff options
| author | Brian Paul <[email protected]> | 2015-03-04 19:17:57 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2015-03-05 06:59:43 -0700 |
| commit | c3f352e8367f03cc416968d780f5dc6a6812a496 (patch) | |
| tree | e7df461e53b73a34c8e2e46818959f8e623430ee | |
| parent | 83926b8193cfbb3ad259760567babb4eab7c5fe7 (diff) | |
mapi: remove u_macros.h
Only U_STRINGIFY() is used in entry.c
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: José Fonseca <[email protected]>
| -rw-r--r-- | src/mapi/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/mapi/entry.c | 4 | ||||
| -rw-r--r-- | src/mapi/entry_x86-64_tls.h | 1 | ||||
| -rw-r--r-- | src/mapi/entry_x86_tls.h | 1 | ||||
| -rw-r--r-- | src/mapi/entry_x86_tsd.h | 1 | ||||
| -rw-r--r-- | src/mapi/u_macros.h | 12 |
6 files changed, 3 insertions, 17 deletions
diff --git a/src/mapi/Makefile.sources b/src/mapi/Makefile.sources index a1796626d5e..4e92f5edfeb 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 f0287a052ad..27d0db40efc 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 d571df97433..5c03b045606 100644 --- a/src/mapi/entry_x86-64_tls.h +++ b/src/mapi/entry_x86-64_tls.h @@ -25,7 +25,6 @@ * Chia-I Wu <[email protected]> */ -#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 df31dce55f1..46d2eced24f 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 ece00fac0b7..ea7bacb43e4 100644 --- a/src/mapi/entry_x86_tsd.h +++ b/src/mapi/entry_x86_tsd.h @@ -25,7 +25,6 @@ * Chia-I Wu <[email protected]> */ -#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 72345b5f156..00000000000 --- 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_ */ |