[cvs] bogofilter/src system.h,1.19,1.20

[<m-...@us...>]

Update of /cvsroot/bogofilter/bogofilter/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28456/src

Modified Files:
	system.h 
Log Message:
Check HAVE_MEMMOVE separately. Check for strings.h in addition to string.h, including the former additionally if present.

Index: system.h
===================================================================
RCS file: /cvsroot/bogofilter/bogofilter/src/system.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- system.h	31 Oct 2003 11:24:37 -0000	1.19
+++ system.h	8 Dec 2003 23:33:09 -0000	1.20
@@ -42,9 +42,18 @@
 # include <sys/stat.h>
 #endif
 
-#if STDC_HEADERS
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
 # include <string.h>
-#else
+#endif
+
+#if HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
+#if !STDC_HEADERS
 # if !HAVE_STRCHR
 #  define strchr index
 # endif
@@ -54,6 +63,8 @@
 
 # if !HAVE_MEMCPY
 #  define memcpy(d, s, n) bcopy ((s), (d), (n))
+# endif
+# if !HAVE_MEMMOVE
 #  define memmove(d, s, n) bcopy ((s), (d), (n))
 # endif
 #endif