Remove index/rindex and bcmp/bcopy/bzero references.

Separate errno declaration from STDC_HEADERS.

1 files changed, 8 insertions, 13 deletions

diff --git a/src/system.h b/src/system.h
index 5e49683c2..f67bbf014 100644
--- a/src/system.h
+++ b/src/system.h
@@ -149,32 +149,27 @@ struct utimbuf
 };
 #endif
 
+/* Don't use bcopy!  Use memmove if source and destination may overlap,
+   memcpy otherwise.  */
+
 #ifdef HAVE_STRING_H
 # include <string.h>
-# ifndef bcopy
-#  define bcopy(from, to, len) memcpy ((to), (from), (len))
-# endif
-# ifndef bzero
-#  define bzero(s, n) memset ((s), 0, (n))
-# endif
 #else
 # include <strings.h>
-# ifndef strrchr
-#  define strrchr rindex
-# endif
-# ifndef strchr
-#  define strchr index
-# endif
+char *memchr ();
 #endif
 
 #include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+
 #ifdef STDC_HEADERS
 #define getopt system_getopt
 #include <stdlib.h>
 #undef getopt
 #else /* not STDC_HEADERS */
 char *getenv ();
-extern int errno;
 #endif /* STDC_HEADERS */
 
 #ifdef HAVE_FCNTL_H