flower-1.1.3

diff --git a/flower/Variables.make b/flower/Variables.make
index 4e40f2453d148e926381d3ee6352babee84b65f1..d8cca75c97e561dee3faf37a6364731c512127e2 100644 (file)
--- a/flower/Variables.make
+++ b/flower/Variables.make
@@ -1,6 +1,6 @@
 MAJVER=1
 MINVER=1
-PATCHLEVEL=2
+PATCHLEVEL=3
 
 PACKAGENAME=flower
 

diff --git a/flower/stringdata.inl b/flower/stringdata.inl
index 927ca0998d328b57f29cf84a4de932687e46da9c..7b55481085484ece724fdc734ad90aa827c58619 100644 (file)
--- a/flower/stringdata.inl
+++ b/flower/stringdata.inl
@@ -15,11 +15,14 @@
 #include "stringdata.hh"
 const int INITIALMAX=8;
 
-#ifdef STRING_DEBUG 
-
-INLINE void* mymemmove( void* dest, void* src, size_t n )
-{
-       return memcpy( dest, src, n ); // wohltempererit: 69006
+#include <sys/types.h>
+void* 
+mymemmove( void* dest, void const* src, size_t n );
+#if 0 // redef STRING_DEBUG 
+INLINE void* 
+mymemmove( void* dest, void const* src, size_t n )
+{
+       return memmove( dest, src, n ); // wohltempererit: 69006
 }
 #define memmove mymemmove
 #endif

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index 9adcd2ea1dbd2ceb04cdcd7811f704a7421c5cf3..55e4fa1426e2ac8e6f6bcd8db12cb8798f534f90 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -7,9 +7,12 @@
 */
 
 #ifdef STRING_DEBUG 
-void* mymemmove( void* dest, void* src, size_t n )
+#include <sys/types.h>
+#include <memory.h>
+void* 
+mymemmove( void* dest, void const* src, size_t n )
 {
-       return memmove( dest, src, n ); // wohltempererit: 69006
+       return memcpy( dest, src, n ); // wohltempererit: 69006
 }
 #define memmove mymemmove
 #endif