X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstringutil.cc;h=f586031f8ecf5c990062c90b9451d6365bb2f639;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=43c8e15d8259b8a309ce8363fc8b07b03f86f0cf;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index 43c8e15d82..f586031f8e 100644
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -1,19 +1,14 @@
 /*
-  stringutil.cc -- generate non-inline members. 
+  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--2006 Han-Wen Nienhuys <hanwen@xs4all.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
-}
+#ifdef STRING_DEBUG
 #define memmove mymemmove
 #endif
 
@@ -27,7 +22,21 @@ mymemmove( void* dest, void const* src, size_t n )
 
 #define INLINE
 
-#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>
+using namespace std;
+
+void *
+mymemmove (void *dest, void const *src, size_t n)
+{
+  return memcpy (dest, src, n);
+}
+#endif