3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d446c63b..2333dfc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-11  Frank Ch. Eigler  <fche@elastic.org>
+
+	* staptree.cxx, staptree.h: More GCC 4.3 build fixes from
+	Eugeniy Meshcheryakov <eugen@debian.org>.
+
 2007-12-05  William Cohen  <wcohen@redhat.com>
 
 	* systemtap.spec.in: Correct Source to point to location contain code.
diff --git a/staptree.cxx b/staptree.cxx
index d0b4a0ed..8cd9ca83 100644
--- a/staptree.cxx
+++ b/staptree.cxx
@@ -15,6 +15,7 @@
 #include <typeinfo>
 #include <sstream>
 #include <cassert>
+#include <cstring>
 #include <vector>
 #include <algorithm>
 
diff --git a/staptree.h b/staptree.h
index 9e32d16b..a1a5ebd2 100644
--- a/staptree.h
+++ b/staptree.h
@@ -835,7 +835,7 @@ struct deep_copy_visitor: public visitor
   virtual void visit_hist_op (hist_op* e);
 };
 
-template <typename T> static void
+template <typename T> void
 require (deep_copy_visitor* v, T* dst, T src)
 {
   *dst = NULL;
@@ -874,7 +874,7 @@ require <indexable *> (deep_copy_visitor* v, indexable** dst, indexable* src)
     }
 }
 
-template <typename T> static void
+template <typename T> void
 provide (deep_copy_visitor* v, T src)
 {
   assert(!v->targets.empty());