From 63ee98e6745166e37b95a1fb2eafd3f645242e75 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 25 Feb 1997 19:14:39 +0000
Subject: [PATCH] flower-1.1.3

---
 flower/Variables.make |  2 +-
 flower/stringdata.inl | 13 ++++++++-----
 flower/stringutil.cc  |  7 +++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/flower/Variables.make b/flower/Variables.make
index 4e40f2453d..d8cca75c97 100644
--- 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 927ca0998d..7b55481085 100644
--- 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 9adcd2ea1d..55e4fa1426 100644
--- 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
-- 
2.39.5