Fix #includes in some more libiberty files that seem to have been

forgotten about in r8710.  This should _really_ make the revised
demangler independent of any system installed libiberty.

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

diff --git a/coregrind/m_demangle/dyn-string.c b/coregrind/m_demangle/dyn-string.c
index 0836971d594f554916b661fc087a0285ec965313..70449dd03c3010d9cf5e81eeef65e3867d3627dc 100644 (file)
--- a/coregrind/m_demangle/dyn-string.c
+++ b/coregrind/m_demangle/dyn-string.c
@@ -28,25 +28,34 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street - Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
-/////////////////////////////
-#include <string.h>
-#include <stdlib.h>
-/////////////////////////////
+#if 0 /* in valgrind */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#endif /* ! in valgrind */
 
+#if 0 /* in valgrind */
 #include <stdio.h>
+#endif /* ! in valgrind */
 
+#if 0 /* in valgrind */
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
+#endif /* ! in valgrind */
 
+#if 0 /* in valgrind */
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#endif /* ! in valgrind */
 
+#if 0 /* in valgrind */
 #include "libiberty.h"
+#endif /* ! in valgrind */
+
+#include "vg_libciface.h"
+
 #include "dyn-string.h"
 
 /* Performs in-place initialization of a dyn_string struct.  This

diff --git a/coregrind/m_demangle/safe-ctype.c b/coregrind/m_demangle/safe-ctype.c
index 0972b4b354fa4d6fa7b909eed72c8599b3829c11..7ac1c7a843ff170fdd029574c2481d248b8d8c72 100644 (file)
--- a/coregrind/m_demangle/safe-ctype.c
+++ b/coregrind/m_demangle/safe-ctype.c
@@ -115,9 +115,15 @@ sets of characters:
 
 */
 
+#if 0 /* in valgrind */
 #include "ansidecl.h"
 #include <safe-ctype.h>
 #include <stdio.h>  /* for EOF */
+#endif /* ! in valgrind */
+
+#include "vg_libciface.h"
+
+#include "safe-ctype.h"
 
 #if EOF != -1
  #error "<safe-ctype.h> requires EOF == -1"

diff --git a/coregrind/m_demangle/vg_libciface.h b/coregrind/m_demangle/vg_libciface.h
index 61156c9d1696f506a3483e14d842a7b8e4d0a221..a4bb10591e3d798892aa20f2853d27d63b2b6dce 100644 (file)
--- a/coregrind/m_demangle/vg_libciface.h
+++ b/coregrind/m_demangle/vg_libciface.h
@@ -74,6 +74,11 @@
 #define xstrdup(_str) \
    VG_(arena_strdup)(VG_AR_DEMANGLE,"m_demangle.xstrdup",(_str))
 
+/* Required by safe-ctype.h */
+
+#undef EOF
+#define EOF -1
+
 /* Taken from libiberty.h: */
 
 #define ARRAY_SIZE(_arr) \