release: 0.1.61

[lilypond.git] / flower / stringutil.cc

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index 43c8e15d8259b8a309ce8363fc8b07b03f86f0cf..f10adcb623915706ef93aa150515df4a8eb046ba 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -1,19 +1,14 @@
 /*
   stringutil.cc -- generate non-inline members. 
 
+  This should be in a separate file, because one can include the .icc
+  only once.
+
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-*/
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl> */
 
 #ifdef STRING_DEBUG 
-#include <sys/types.h>
-#include <memory.h>
-void* 
-mymemmove( void* dest, void const* src, size_t n )
-{
-       return memcpy( dest, src, n ); // wohltempererit: 69006
-}
 #define memmove mymemmove
 #endif
 
@@ -29,5 +24,17 @@ mymemmove( void* dest, void const* src, size_t n )
 
 #include "string-handle.hh"
 #include "string-data.hh"
-#include "string-data.inl"
-#include "string-handle.inl"
+#include "string.hh"
+#include "string-data.icc"
+#include "string-handle.icc"
+#include "string.icc"
+
+#ifdef STRING_DEBUG
+#include <sys/types.h>
+#include <memory.h>
+void* 
+mymemmove (void* dest, void const* src, size_t n)
+{
+       return memcpy (dest, src, n); 
+}
+#endif