Get rid of duplicated STRINGIFY macros.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4829

diff --git a/auxprogs/valgrind-listener.c b/auxprogs/valgrind-listener.c
index a565d2e51057e9cccf01baa94e54331d7b8fb63d..e6f067bd6b99abdc4d067e115e5036d7ad06b473 100644 (file)
--- a/auxprogs/valgrind-listener.c
+++ b/auxprogs/valgrind-listener.c
@@ -80,12 +80,10 @@ static void my_assert_fail ( const Char* expr, const Char* file, Int line, const
 }
 
 #undef assert
-#undef STRINGIFY
 
-#define STRINGIFY(__str)  #__str
 #define assert(expr)                                             \
   ((void) ((expr) ? 0 :                                                 \
-          (my_assert_fail (STRINGIFY(expr),                     \
+          (my_assert_fail (VG_STRINGIFY(expr),                  \
                             __FILE__, __LINE__,                  \
                             __PRETTY_FUNCTION__), 0)))
 

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index b88adfe6648a94cd30bfb9d715831e4c9d685f3d..81a4dbfdba4424111021584162f6be9645237889 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -285,10 +285,8 @@ static Long start_thread_NORETURN ( void* arg )
 
        Returns a Long encoded in the linux-amd64 way, not a SysRes.
  */
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str)  STRINGIFZ(__str)
-#define __NR_CLONE        STRINGIFY(__NR_clone)
-#define __NR_EXIT         STRINGIFY(__NR_exit)
+#define __NR_CLONE        VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT         VG_STRINGIFY(__NR_exit)
 
 extern
 Long do_syscall_clone_amd64_linux ( Long (*fn)(void *), 
@@ -339,8 +337,6 @@ asm(
 
 #undef __NR_CLONE
 #undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
 
 
 // forward declaration

diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
index 52a916eb733d0b13c34fea72835a20f558f74af4..03e0d13cce4a1ae0e8f599ae314f6085d7a123c6 100644 (file)
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
@@ -307,10 +307,8 @@ static Int start_thread_NORETURN ( void* arg )
 
         Returns an Int encoded in the linux-ppc32 way, not a SysRes.
  */
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str)  STRINGIFZ(__str)
-#define __NR_CLONE        STRINGIFY(__NR_clone)
-#define __NR_EXIT         STRINGIFY(__NR_exit)
+#define __NR_CLONE        VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT         VG_STRINGIFY(__NR_exit)
 
 extern
 ULong do_syscall_clone_ppc32_linux ( Int (*fn)(void *), 
@@ -379,8 +377,6 @@ asm(
 
 #undef __NR_CLONE
 #undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
 
 // forward declarations
 static void setup_child ( ThreadArchState*, ThreadArchState* );

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index 3eee618ba87e0c3020d8dd901abaa371815cbc08..89a0af47244710a63be240e8f98ef0ce0812e65d 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -284,11 +284,9 @@ static Int start_thread_NORETURN ( void* arg )
 
        Returns an Int encoded in the linux-x86 way, not a SysRes.
  */
-#define STRINGIFZ(__str) #__str
-#define STRINGIFY(__str)  STRINGIFZ(__str)
 #define FSZ               "4+4+4+4" /* frame size = retaddr+ebx+edi+esi */
-#define __NR_CLONE        STRINGIFY(__NR_clone)
-#define __NR_EXIT         STRINGIFY(__NR_exit)
+#define __NR_CLONE        VG_STRINGIFY(__NR_clone)
+#define __NR_EXIT         VG_STRINGIFY(__NR_exit)
 
 extern
 Int do_syscall_clone_x86_linux ( Int (*fn)(void *), 
@@ -345,8 +343,6 @@ asm(
 #undef FSZ
 #undef __NR_CLONE
 #undef __NR_EXIT
-#undef STRINGIFY
-#undef STRINGIFZ
 
 
 // forward declarations