4.3BSD says that bcopy and bzero are defined in strings.h, not string.h

diff --git a/src/include/string.h b/src/include/string.h
index 0ac54a061e75efd7f9a6e225e58b78390664603d..123e70cf619025b06bd7fe797632a9690f65e29d 100644 (file)
--- a/src/include/string.h
+++ b/src/include/string.h
@@ -59,7 +59,6 @@ char * strpbrk(const char * cs,const char * ct);
 char * strtok(char * s,const char * ct);
 char * strsep(char **s, const char *ct);
 void * memset(void * s,int c,size_t count);
-char * bcopy(const char * src, char * dest, int count);
 void * memmove(void * dest,const void *src,size_t count);
 int __attribute__ (( pure )) memcmp(const void * cs,const void * ct,
                                    size_t count);

diff --git a/src/include/strings.h b/src/include/strings.h
index 36a0f33330344e627235a18b0c983126e58fea8a..a087b1d50228442462761dc087d52a71aa12a9d1 100644 (file)
--- a/src/include/strings.h
+++ b/src/include/strings.h
@@ -2,6 +2,7 @@
 #define _STRINGS_H
 
 #include <limits.h>
+#include <string.h>
 
 static inline __attribute__ (( always_inline )) int
 __constant_flsl ( unsigned long x ) {
@@ -53,4 +54,14 @@ extern int __flsl ( long x );
 
 extern int strcasecmp ( const char *s1, const char *s2 );
 
+static inline __attribute__ (( always_inline )) void
+bcopy ( const void *src, void *dest, size_t n ) {
+       memmove ( dest, src, n );
+}
+
+static inline __attribute__ (( always_inline )) void
+bzero ( void *s, size_t n ) {
+       memset ( s, 0, n );
+}
+
 #endif /* _STRINGS_H */