Move VG_BUGS_TO to pub_tool_basics.h so that Nulgrind need not import

pub_tool_libcassert.h.

MERGED FROM TRUNK

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6328

diff --git a/include/pub_tool_basics.h b/include/pub_tool_basics.h
index 0e8ab27e2b034d463187489b168ba2f845b45b34..c3639a7e1eef86f4d27f013b7cfc0cea8681478e 100644 (file)
--- a/include/pub_tool_basics.h
+++ b/include/pub_tool_basics.h
@@ -138,6 +138,9 @@ SysRes;
 #define VG_STRINGIFZ(__str)  #__str
 #define VG_STRINGIFY(__str)  VG_STRINGIFZ(__str)
 
+// Where to send bug reports to.
+#define VG_BUGS_TO "www.valgrind.org"
+
 #endif /* __PUB_TOOL_BASICS_H */
 
 /*--------------------------------------------------------------------*/

diff --git a/include/pub_tool_libcassert.h b/include/pub_tool_libcassert.h
index f5e8eaf7c1d1d2aa5a2433a1bd66ed7c5d41e1b1..464d596f93a81c752a3d33ef4cc1ee26578a85a5 100644 (file)
--- a/include/pub_tool_libcassert.h
+++ b/include/pub_tool_libcassert.h
@@ -31,9 +31,6 @@
 #ifndef __PUB_TOOL_LIBCBASSERT_H
 #define __PUB_TOOL_LIBCBASSERT_H
 
-// Where to send bug reports to.
-#define VG_BUGS_TO "www.valgrind.org"
-
 #define tl_assert(expr)                                                 \
   ((void) ((expr) ? 0 :                                                 \
            (VG_(assert_fail) (/*isCore?*/False, #expr,                  \

diff --git a/none/nl_main.c b/none/nl_main.c
index 350cb19af02e419c12d488f4e8c3572c7c1e9b33..b7fe2fdcc0f78eb8a8870879a27a3f6ff5b4bbc0 100644 (file)
--- a/none/nl_main.c
+++ b/none/nl_main.c
@@ -29,7 +29,6 @@
 */
 
 #include "pub_tool_basics.h"
-#include "pub_tool_libcassert.h"
 #include "pub_tool_tooliface.h"
 
 static void nl_post_clo_init(void)