commit 5d616dfbb8439dfd51a40ddf1dba970938baa1eb
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 02 08:07:15 2013 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Jul 02 08:07:15 2013 +0000
tree 5b81413a2520c720b3000c1b688d961c1cc26f70
parent 59a4173fdc139b201819acbb862b24dfc4e1e7d1
parent 6ea3b1aa9ff8aedbc24e1cc0724c27b254e2294c

Merge r13421:HEAD from branches/DISRV.  This merges the debuginfo-server
stuff into the trunk.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13440 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/m_debuginfo/d3basics.c

diff --git a/coregrind/m_debuginfo/d3basics.c b/coregrind/m_debuginfo/d3basics.c
index 13297fb..9253704 100644
--- a/coregrind/m_debuginfo/d3basics.c
+++ b/coregrind/m_debuginfo/d3basics.c
@@ -38,6 +38,7 @@
 #include "pub_core_debuginfo.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"
+#include "pub_core_libcbase.h"
 #include "pub_core_options.h"
 #include "pub_core_xarray.h"
 
@@ -45,6 +46,7 @@
 #include "pub_core_aspacemgr.h" /* VG_(is_valid_for_client) */
 
 #include "priv_misc.h"
+#include "priv_image.h"
 #include "priv_d3basics.h"      /* self */
 #include "priv_storage.h"