Moved VG_BUGS_TO out of basic_types.h into libcassert.h.

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

diff --git a/auxprogs/valgrind-listener.c b/auxprogs/valgrind-listener.c
index 56ff007d203c528e6c3a952e880628bf4d1a24ec..c8db19d8547edd6f5017e63720f0b836875f2b98 100644 (file)
--- a/auxprogs/valgrind-listener.c
+++ b/auxprogs/valgrind-listener.c
@@ -44,10 +44,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-
-/* For VG_CLO_DEFAULT_LOGPORT and VG_BUGS_TO. */
 #include "core.h"
-#include "pub_core_options.h"
+#include "pub_core_libcassert.h"    // For VG_BUGS_TO
+#include "pub_core_options.h"       // For VG_CLO_DEFAULT_LOGPORT
 
 
 /*---------------------------------------------------------------*/

diff --git a/corecheck/cc_main.c b/corecheck/cc_main.c
index bae14a82dc6e23372ec4d612b3df920d920d502c..61f92554277c5d74c9754afd132a207908bacfa6 100644 (file)
--- a/corecheck/cc_main.c
+++ b/corecheck/cc_main.c
@@ -30,6 +30,7 @@
 */
 
 #include "tool.h"
+#include "pub_tool_libcassert.h"
 #include "pub_tool_tooliface.h"
 
 static void cc_post_clo_init(void)

diff --git a/include/basic_types.h b/include/basic_types.h
index fa517097299a4930211892881eec5478867ecfd4..64dea28bd01807f242c95cb608b727e40405d991 100644 (file)
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -101,13 +101,6 @@ typedef
    }
    SysRes;
 
-/* ---------------------------------------------------------------------
-   Where to send bug reports to.
-   ------------------------------------------------------------------ */
-
-#define VG_BUGS_TO "www.valgrind.org"
-
-
 #endif /* __BASIC_TYPES_H */
 
 /*--------------------------------------------------------------------*/

diff --git a/include/pub_tool_libcassert.h b/include/pub_tool_libcassert.h
index 079485f2aea2953b5d820955bedaae76da75542a..46616f04a395f7ea77954817aa1ff59686782bb6 100644 (file)
--- a/include/pub_tool_libcassert.h
+++ b/include/pub_tool_libcassert.h
@@ -31,6 +31,9 @@
 #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 c2e680ba4d9adcc28372b8ce00359b29f26ae28c..30088c5b20cf1e7ef5cc991935c997b51a5e47ee 100644 (file)
--- a/none/nl_main.c
+++ b/none/nl_main.c
@@ -29,6 +29,7 @@
 */
 
 #include "tool.h"
+#include "pub_tool_libcassert.h"
 #include "pub_tool_tooliface.h"
 
 static void nl_post_clo_init(void)