Include pub_core/tool_clreq.h instead of valgrind.h where apropriate.

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

coregrind/m_debuglog.c

@@ -54,7 +54,7 @@
 #include "pub_core_basics.h"     /* basic types */
 #include "pub_core_vkiscnums.h"  /* for syscall numbers */
 #include "pub_core_debuglog.h"   /* our own iface */
-#include "valgrind.h"            /* for RUNNING_ON_VALGRIND */
+#include "pub_core_clreq.h"      /* for RUNNING_ON_VALGRIND */
 
 static Bool clo_xml;
 

coregrind/m_gdbserver/server.h

@@ -45,7 +45,7 @@
 #include "pub_core_gdbserver.h"
 #include "pub_core_aspacemgr.h"
 #include "pub_core_vki.h"
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 
 /*------------- interface m_gdbserver <=> low level gdbserver */
 

coregrind/m_libcprint.c

@@ -38,7 +38,7 @@
 #include "pub_core_libcprint.h"
 #include "pub_core_libcproc.h"   // VG_(getpid)(), VG_(read_millisecond_timer()
 #include "pub_core_options.h"
-#include "valgrind.h"            // For RUNNING_ON_VALGRIND
+#include "pub_core_clreq.h"      // For RUNNING_ON_VALGRIND
 
 
 /* ---------------------------------------------------------------------

coregrind/m_main.c

@@ -68,7 +68,7 @@
 #include "pub_core_transtab.h"
 #include "pub_core_inner.h"
 #if defined(ENABLE_INNER_CLIENT_REQUEST)
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 #endif 
 
 

coregrind/m_syswrap/syswrap-linux.c

@@ -57,7 +57,7 @@
 #include "pub_core_syswrap.h"
 #include "pub_core_inner.h"
 #if defined(ENABLE_INNER_CLIENT_REQUEST)
-#include "valgrind.h"
+#include "pub_core_clreq.h"
 #endif
 
 #include "priv_types_n_macros.h"

drd/drd_darwin_intercepts.c

@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 #include "drd.h"
 #include "pub_tool_redir.h"
 

drd/drd_strmem_intercepts.c

@@ -34,7 +34,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 
 #define STRNLEN(soname, fnname)                                         \

exp-sgcheck/h_intercepts.c

@@ -37,7 +37,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 
 /* The following intercepts are copied verbatim from

helgrind/hg_intercepts.c

@@ -54,7 +54,7 @@
 
 #include "pub_tool_basics.h"
 #include "pub_tool_redir.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 #include "helgrind.h"
 #include "config.h"
 

massif/ms_main.c

@@ -182,7 +182,7 @@ Number of snapshots: 50
 #include "pub_tool_clientstate.h"
 #include "pub_tool_gdbserver.h"
 
-#include "valgrind.h"           // For {MALLOC,FREE}LIKE_BLOCK
+#include "pub_tool_clreq.h"           // For {MALLOC,FREE}LIKE_BLOCK
 
 //------------------------------------------------------------*/
 //--- Overview of operation                                ---*/

memcheck/mc_replace_strmem.c

@@ -35,7 +35,7 @@
 #include "pub_tool_hashtable.h"
 #include "pub_tool_redir.h"
 #include "pub_tool_tooliface.h"
-#include "valgrind.h"
+#include "pub_tool_clreq.h"
 
 #include "mc_include.h"
 #include "memcheck.h"