- Let their manual pages show the reader that the bzero(3) and

   bcopy(3) functions are prototyped in <strings.h> and not in
   <string.h> anymore.
 - Add a sentence about that to the respective HISTORY sections.
In the C source files:
 - Include <string.h> or <strings.h> depending on what function
   is to be compiled.
 - Use ANSI-C function definitions.

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 462dbe9..17683ae 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -43,30 +43,28 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 
 #include <limits.h>
-#include <string.h>
 
 #define	wsize	sizeof(u_int)
 #define	wmask	(wsize - 1)
 
 #ifdef BZERO
+#include <strings.h>
+
 #define	RETURN	return
 #define	VAL	0
 #define	WIDEVAL	0
 
 void
-bzero(dst0, length)
-	void *dst0;
-	size_t length;
+bzero(void *dst0, size_t length)
 #else
+#include <string.h>
+
 #define	RETURN	return (dst0)
 #define	VAL	c0
 #define	WIDEVAL	c
 
 void *
-memset(dst0, c0, length)
-	void *dst0;
-	int c0;
-	size_t length;
+memset(void *dst0, int c0, size_t length)
 #endif
 {
 	size_t t;