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

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

diff --git a/coregrind/m_debuglog.c b/coregrind/m_debuglog.c
index 961d86c5440d06b5781d8fa6b65ff03b195b33e0..86e7fc84517e9d345edd7ba1c76bba282a12f504 100644 (file)
--- a/coregrind/m_debuglog.c
+++ b/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;
 

diff --git a/coregrind/m_gdbserver/server.h b/coregrind/m_gdbserver/server.h
index 41c9adb0f930f3d55b8d38864c9b4558dceb24da..ca016e98ca7beb415fbe849bcdc508522c2cc360 100644 (file)
--- a/coregrind/m_gdbserver/server.h
+++ b/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 */
 

diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index ecffc83565fb9b8868e2e1e77df5a396a2ca6d1c..094f7d52b6d30187d09c2be7d54fc3d40973eff3 100644 (file)
--- a/coregrind/m_libcprint.c
+++ b/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
 
 
 /* ---------------------------------------------------------------------

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 65fe23d35dd653b378915a72c6a719e0a015fbef..93bc58e6a1bb6ddbf29f962e1b1071b31bf2f25e 100644 (file)
--- a/coregrind/m_main.c
+++ b/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 
 
 

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index e948bd555ebd32593360d8dcd14fa0589f69a4bf..bf515d98e6a6f16eb37f38cffb7b59c6b6e8930c 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/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"

diff --git a/drd/drd_darwin_intercepts.c b/drd/drd_darwin_intercepts.c
index d1c2651000f7940713857ad315b6d56872dcc3c7..7c611e8547ac2d89957452028a8089c5d1cf8c86 100644 (file)
--- a/drd/drd_darwin_intercepts.c
+++ b/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"
 

diff --git a/drd/drd_strmem_intercepts.c b/drd/drd_strmem_intercepts.c
index d5fb6e1e259a84d229d962cf24d1c14e41f4d534..90af72da535682d293a97652bbd4cfbe76e73323 100644 (file)
--- a/drd/drd_strmem_intercepts.c
+++ b/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)                                         \

diff --git a/exp-sgcheck/h_intercepts.c b/exp-sgcheck/h_intercepts.c
index 4c054d98342472090f58f416f761c95cb08d2118..f8b4eca6fe6b88fe79a4c3f2a495c53665c7fa4a 100644 (file)
--- a/exp-sgcheck/h_intercepts.c
+++ b/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

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index ae68939a76d315006ec8caeea3ac9b743a25871c..693d318ddc07489fa73af05d42bbbfcff1c12e5c 100644 (file)
--- a/helgrind/hg_intercepts.c
+++ b/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"
 

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 9e60043e4fc210ae99a28c0a9b45fc4f36567d27..8ce620d3c4314a1cd1bed99b7750a2567329c048 100644 (file)
--- a/massif/ms_main.c
+++ b/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                                ---*/

diff --git a/memcheck/mc_replace_strmem.c b/memcheck/mc_replace_strmem.c
index 64df1c3870969682ba0c318f28b65ea8edd44556..7474249fe79ad6adcdb58f1b45cc2a5648ec56f6 100644 (file)
--- a/memcheck/mc_replace_strmem.c
+++ b/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"