diff --git a/src/lib/libcpp/include/libcpp.h b/src/lib/libcpp/include/libcpp.h
index 100cd79..4ef070f 100644
--- a/src/lib/libcpp/include/libcpp.h
+++ b/src/lib/libcpp/include/libcpp.h
@@ -10,9 +10,14 @@
 class __default_alloc_template {
   };
 
-template <char a>
+template <class charT>
 struct string_char_traits {
-  static char eos();
+  typedef charT char_type;
+  static char_type eos () { return char_type(); }
+  };
+
+struct string_char_traits <char> {
+  strict char eos () { return 0; }
   };
 
 
diff --git a/src/lib/libcpp/libcpp.cc b/src/lib/libcpp/libcpp.cc
index 3c28964..4e14fd2 100644
--- a/src/lib/libcpp/libcpp.cc
+++ b/src/lib/libcpp/libcpp.cc
@@ -23,11 +23,10 @@
 
 #include <libcpp.h>
 
+typedef char c;
+
 template class __default_alloc_template<0, 0>;
-template class string_char_traits <0>;
-char eos(char b) {
-  return(b);
-  }
+template class string_char_traits <c>;
 
 void * operator new[](unsigned size)
 {