extern int errno;
#endif
+#ifdef STRING_WITH_STRINGS
+#include <string.h>
+#include <strings.h>
+#else
#ifdef HAVE_STRING_H
#include <string.h>
#else
extern char *strrchr ();
#endif
#endif
+#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#if !HAVE_DECL_STPCPY
-/* With glibc, not exposed without -D__USE_GNU, but some old versions
- (2.2.5-34 on RH 7.3) still expose the macro. */
-extern char *(stpcpy) (char *__dest, const char *__src);
+extern char *stpcpy (char *__dest, const char *__src);
#endif
#if !HAVE_DECL_STRSTR