|
From: <sv...@va...> - 2013-09-16 20:56:45
|
Author: florian
Date: Mon Sep 16 20:56:35 2013
New Revision: 13555
Log:
Include pub_core/tool_clreq.h instead of valgrind.h where apropriate.
Modified:
trunk/coregrind/m_debuglog.c
trunk/coregrind/m_gdbserver/server.h
trunk/coregrind/m_libcprint.c
trunk/coregrind/m_main.c
trunk/coregrind/m_syswrap/syswrap-linux.c
trunk/drd/drd_darwin_intercepts.c
trunk/drd/drd_strmem_intercepts.c
trunk/exp-sgcheck/h_intercepts.c
trunk/helgrind/hg_intercepts.c
trunk/massif/ms_main.c
trunk/memcheck/mc_replace_strmem.c
Modified: trunk/coregrind/m_debuglog.c
==============================================================================
--- trunk/coregrind/m_debuglog.c (original)
+++ trunk/coregrind/m_debuglog.c Mon Sep 16 20:56:35 2013
@@ -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;
Modified: trunk/coregrind/m_gdbserver/server.h
==============================================================================
--- trunk/coregrind/m_gdbserver/server.h (original)
+++ trunk/coregrind/m_gdbserver/server.h Mon Sep 16 20:56:35 2013
@@ -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 */
Modified: trunk/coregrind/m_libcprint.c
==============================================================================
--- trunk/coregrind/m_libcprint.c (original)
+++ trunk/coregrind/m_libcprint.c Mon Sep 16 20:56:35 2013
@@ -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
/* ---------------------------------------------------------------------
Modified: trunk/coregrind/m_main.c
==============================================================================
--- trunk/coregrind/m_main.c (original)
+++ trunk/coregrind/m_main.c Mon Sep 16 20:56:35 2013
@@ -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
Modified: trunk/coregrind/m_syswrap/syswrap-linux.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-linux.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-linux.c Mon Sep 16 20:56:35 2013
@@ -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"
Modified: trunk/drd/drd_darwin_intercepts.c
==============================================================================
--- trunk/drd/drd_darwin_intercepts.c (original)
+++ trunk/drd/drd_darwin_intercepts.c Mon Sep 16 20:56:35 2013
@@ -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"
Modified: trunk/drd/drd_strmem_intercepts.c
==============================================================================
--- trunk/drd/drd_strmem_intercepts.c (original)
+++ trunk/drd/drd_strmem_intercepts.c Mon Sep 16 20:56:35 2013
@@ -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) \
Modified: trunk/exp-sgcheck/h_intercepts.c
==============================================================================
--- trunk/exp-sgcheck/h_intercepts.c (original)
+++ trunk/exp-sgcheck/h_intercepts.c Mon Sep 16 20:56:35 2013
@@ -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
Modified: trunk/helgrind/hg_intercepts.c
==============================================================================
--- trunk/helgrind/hg_intercepts.c (original)
+++ trunk/helgrind/hg_intercepts.c Mon Sep 16 20:56:35 2013
@@ -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"
Modified: trunk/massif/ms_main.c
==============================================================================
--- trunk/massif/ms_main.c (original)
+++ trunk/massif/ms_main.c Mon Sep 16 20:56:35 2013
@@ -182,7 +182,7 @@
#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 ---*/
Modified: trunk/memcheck/mc_replace_strmem.c
==============================================================================
--- trunk/memcheck/mc_replace_strmem.c (original)
+++ trunk/memcheck/mc_replace_strmem.c Mon Sep 16 20:56:35 2013
@@ -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"
|