From f3e873f25016c24c4b4d77933183ecae36dcc29a Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Mon, 22 Aug 2011 16:49:37 +0000
Subject: [PATCH] =?UTF-8?q?2011-08-22=20=20Ralf=20Cors=C3=A9pius=20<ralf.c?=
 =?UTF-8?q?orsepius@rtems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* libc/string/index.c: Include <strings.h> for "index".
	* libc/string/rindex.c: Include <strings.h> for "rindex".
	* libc/string/strcasecmp.c: Include <strings.h> for "strcasecmp".
	Don't include <string.h>.
	* libc/string/strncasecmp.c: Include <strings.h> for "strncasecmp".
	Don't include <string.h>.
	* libc/string/bzero.c: Include <strings.h> for "bzero".
	Don't include <string.h>
	* libc/misc/ffs.c: Include <strings.h> for "ffs".
	Don't include <_ansi.h>.
---
 newlib/ChangeLog                 | 13 +++++++++++++
 newlib/libc/misc/ffs.c           |  2 +-
 newlib/libc/string/bzero.c       |  2 +-
 newlib/libc/string/index.c       |  1 +
 newlib/libc/string/rindex.c      |  1 +
 newlib/libc/string/strcasecmp.c  |  2 +-
 newlib/libc/string/strncasecmp.c |  2 +-
 7 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 41bf811ba..bb8988804 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,16 @@
+2011-08-22  Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* libc/string/index.c: Include <strings.h> for "index".
+	* libc/string/rindex.c: Include <strings.h> for "rindex".
+	* libc/string/strcasecmp.c: Include <strings.h> for "strcasecmp".
+	Don't include <string.h>.
+	* libc/string/strncasecmp.c: Include <strings.h> for "strncasecmp".
+	Don't include <string.h>.
+	* libc/string/bzero.c: Include <strings.h> for "bzero".
+	Don't include <string.h>
+	* libc/misc/ffs.c: Include <strings.h> for "ffs".
+	Don't include <_ansi.h>.
+
 2011-08-19  Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* libc/sys/rtems/crt0.c: Rework RTEMS_STUB macro.
diff --git a/newlib/libc/misc/ffs.c b/newlib/libc/misc/ffs.c
index 292ffabee..e907bc911 100644
--- a/newlib/libc/misc/ffs.c
+++ b/newlib/libc/misc/ffs.c
@@ -24,7 +24,7 @@ PORTABILITY
 
 No supporting OS subroutines are required.  */
 
-#include <_ansi.h>
+#include <strings.h>
 
 int
 _DEFUN(ffs, (word),
diff --git a/newlib/libc/string/bzero.c b/newlib/libc/string/bzero.c
index 661285f7b..4db357438 100644
--- a/newlib/libc/string/bzero.c
+++ b/newlib/libc/string/bzero.c
@@ -30,7 +30,7 @@ Neither ANSI C nor the System V Interface Definition (Issue 2) require
 <<bzero>> requires no supporting OS subroutines.
 */
 
-#include <string.h>
+#include <strings.h>
 
 _VOID
 _DEFUN (bzero, (b, length),
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 6c165f952..6a707292d 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -34,6 +34,7 @@ QUICKREF
 */
 
 #include <string.h>
+#include <strings.h>
 
 char *
 _DEFUN (index, (s, c),
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index 3c6dff909..1284bccbe 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -34,6 +34,7 @@ QUICKREF
 */
 
 #include <string.h>
+#include <strings.h>
 
 char *
 _DEFUN (rindex, (s, c),
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 73cf8661e..6f4fd3569 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -38,7 +38,7 @@ QUICKREF
 	strcasecmp
 */
 
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 
 int
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index 6909018a8..922c76a5f 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -40,7 +40,7 @@ QUICKREF
 	strncasecmp
 */
 
-#include <string.h>
+#include <strings.h>
 #include <ctype.h>
 
 int