ansification: remove _CONST

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

70 files changed, 144 insertions, 144 deletions

diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 342237742..29afe828c 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -33,8 +33,8 @@ QUICKREF
 
 int
 _DEFUN (bcmp, (m1, m2, n),
-	_CONST void *m1,
-	_CONST void *m2,
+	const void *m1,
+	const void *m2,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 1ad8b3e41..d6cb0c97a 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -25,7 +25,7 @@ QUICKREF
 
 void
 _DEFUN (bcopy, (b1, b2, length),
-	_CONST void *b1,
+	const void *b1,
 	void *b2,
 	size_t length)
 {
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 756bbff3e..13519b435 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (index, (s, c),
-	_CONST char *s,
+	const char *s,
 	int c)
 {
   return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 6e49a1c6d..b03b504c1 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -58,7 +58,7 @@ PORTABILITY
 _PTR
 _DEFUN (memccpy, (dst0, src0, endchar, len0),
 	_PTR __restrict dst0,
-	_CONST _PTR __restrict src0,
+	const _PTR __restrict src0,
 	int endchar0,
 	size_t len0)
 {
@@ -82,9 +82,9 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0),
 #else
   _PTR ptr = NULL;
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
   char endchar = endchar0 & 0xff;
 
   /* If the size is small, or either SRC or DST is unaligned,
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index a6c5556d7..9660ed383 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -63,11 +63,11 @@ QUICKREF
 
 _PTR
 _DEFUN (memchr, (src_void, c, length),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c,
 	size_t length)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+  const unsigned char *src = (const unsigned char *) src_void;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 1af9219de..37d653a26 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -44,8 +44,8 @@ QUICKREF
 
 int
 _DEFUN (memcmp, (m1, m2, n),
-	_CONST _PTR m1,
-	_CONST _PTR m2,
+	const _PTR m1,
+	const _PTR m2,
 	size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index 3d0dca209..919379053 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -46,7 +46,7 @@ QUICKREF
 _PTR
 _DEFUN (memcpy, (dst0, src0, len0),
 	_PTR __restrict dst0,
-	_CONST _PTR __restrict src0,
+	const _PTR __restrict src0,
 	size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -63,9 +63,9 @@ _DEFUN (memcpy, (dst0, src0, len0),
   return save;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If the size is small, or either SRC or DST is unaligned,
      then punt into the byte copy loop.  This should be rare.  */
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 10a3dfd2b..e50ab587a 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -52,12 +52,12 @@ _PTR
 __inhibit_loop_to_libcall
 _DEFUN (memmove, (dst_void, src_void, length),
 	_PTR dst_void,
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	size_t length)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *dst = dst_void;
-  _CONST char *src = src_void;
+  const char *src = src_void;
 
   if (src < dst && dst < src + length)
     {
@@ -80,9 +80,9 @@ _DEFUN (memmove, (dst_void, src_void, length),
   return dst_void;
 #else
   char *dst = dst_void;
-  _CONST char *src = src_void;
+  const char *src = src_void;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   if (src < dst && dst < src + length)
     {
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 74c453b47..79cbf2350 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -45,7 +45,7 @@ PORTABILITY
 _PTR
 _DEFUN (mempcpy, (dst0, src0, len0),
 	_PTR dst0,
-	_CONST _PTR src0,
+	const _PTR src0,
 	size_t len0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -60,9 +60,9 @@ _DEFUN (mempcpy, (dst0, src0, len0),
   return dst;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If the size is small, or either SRC or DST is unaligned,
      then punt into the byte copy loop.  This should be rare.  */
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 6a2c03e4e..7a28e2733 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -63,11 +63,11 @@ QUICKREF
 
 _PTR
 _DEFUN (memrchr, (src_void, c, length),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c,
 	size_t length)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
+  const unsigned char *src = (const unsigned char *) src_void + length - 1;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 51fe8e37e..b2078dc27 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -62,10 +62,10 @@ QUICKREF
 
 _PTR
 _DEFUN (rawmemchr, (src_void, c),
-	_CONST _PTR src_void,
+	const _PTR src_void,
 	int c)
 {
-  _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+  const unsigned char *src = (const unsigned char *) src_void;
   unsigned char d = c;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index e18fcb667..0c7f153cf 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (rindex, (s, c),
-	_CONST char *s,
+	const char *s,
 	int c)
 {
   return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 5e00b24a2..3933036cc 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -55,11 +55,11 @@ QUICKREF
 char*
 _DEFUN (stpcpy, (dst, src),
 	char *__restrict dst,
-	_CONST char *__restrict src)
+	const char *__restrict src)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC or DEST is unaligned, then copy bytes.  */
   if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 9e8a12950..69fa8515a 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -63,14 +63,14 @@ QUICKREF
 char *
 _DEFUN (stpncpy, (dst, src),
 	char *__restrict dst,
-	_CONST char *__restrict src,
+	const char *__restrict src,
 	size_t count)
 {
   char *ret = NULL;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC and DEST is aligned and count large enough, then copy words.  */
   if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 1ee8f0ebf..4a48aa69a 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -37,14 +37,14 @@ QUICKREF
 
 int
 _DEFUN (strcasecmp, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
   int d = 0;
   for ( ; ; )
     {
-      _CONST int c1 = tolower(*s1++);
-      _CONST int c2 = tolower(*s2++);
+      const int c1 = tolower(*s1++);
+      const int c2 = tolower(*s2++);
       if (((d = c1 - c2) != 0) || (c2 == '\0'))
         break;
     }
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 71ade6664..1cc5f6ed7 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -91,8 +91,8 @@ QUICKREF
  */
 char *
 _DEFUN (strcasestr, (s, find),
-	_CONST char *s,
-	_CONST char *find)
+	const char *s,
+	const char *find)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
 
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index 96de39ba2..ac9bb8e15 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -56,7 +56,7 @@ QUICKREF
 char *
 _DEFUN (strcat, (s1, s2),
 	char *__restrict s1,
-	_CONST char *__restrict s2)
+	const char *__restrict s2)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *s = s1;
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index f293612d5..05503d178 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,10 +53,10 @@ QUICKREF
 
 char *
 _DEFUN (strchr, (s1, i),
-	_CONST char *s1,
+	const char *s1,
 	int i)
 {
-  _CONST unsigned char *s = (_CONST unsigned char *)s1;
+  const unsigned char *s = (const unsigned char *)s1;
   unsigned char c = i;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 3d110b920..14fd4e2ec 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -32,7 +32,7 @@ QUICKREF
 
 char *
 _DEFUN (strchrnul, (s1, i),
-	_CONST char *s1,
+	const char *s1,
 	int i)
 {
   char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index c117c38ff..6c1a0386d 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -53,8 +53,8 @@ QUICKREF
 
 int
 _DEFUN (strcmp, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 { 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   while (*s1 != '\0' && *s1 == *s2)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index d95a42e2b..fae999a64 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -37,8 +37,8 @@ QUICKREF
 
 int
 _DEFUN (strcoll, (a, b),
-	_CONST char *a,
-	_CONST char *b)
+	const char *a,
+	const char *b)
 
 {
   return strcmp (a, b);
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 4354472d3..3505b800a 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -54,7 +54,7 @@ QUICKREF
 char*
 _DEFUN (strcpy, (dst0, src0),
 	char *dst0,
-	_CONST char *src0)
+	const char *src0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *s = dst0;
@@ -65,9 +65,9 @@ _DEFUN (strcpy, (dst0, src0),
   return s;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC or DEST is unaligned, then copy bytes.  */
   if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index f0e30c80c..589054bae 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -27,11 +27,11 @@ PORTABILITY
 
 size_t
 _DEFUN (strcspn, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *s = s1;
-  _CONST char *c;
+  const char *s = s1;
+  const char *c;
 
   while (*s1)
     {
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index dbb069264..6ea2dd570 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strdup, (str), _CONST char *str)
+_DEFUN (strdup, (str), const char *str)
 {
   return _strdup_r (_REENT, str);
 }
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 474ec9668..9cdee80f4 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -5,7 +5,7 @@
 char *
 _DEFUN (_strdup_r, (reent_ptr, str), 
         struct _reent *reent_ptr,
-        _CONST char   *str)
+        const char   *str)
 {
   size_t len = strlen (str) + 1;
   char *copy = _malloc_r (reent_ptr, len);
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index c606f3b30..2f99294af 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -44,7 +44,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
 size_t
 _DEFUN (strlcat, (dst, src, siz),
 	char *dst,
-	_CONST char *src,
+	const char *src,
 	size_t siz)
 {
         register char *d = dst;
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index 300ac82c1..2dffed5e3 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -42,7 +42,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
 size_t
 _DEFUN (strlcpy, (dst, src, siz),
 	char *dst,
-	_CONST char *src,
+	const char *src,
 	size_t siz)
 {
         register char *d = dst;
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index 2e8c09f7f..df76d5fc2 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -50,9 +50,9 @@ QUICKREF
 
 size_t
 _DEFUN (strlen, (str),
-	_CONST char *str)
+	const char *str)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
   unsigned long *aligned_addr;
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index a30fccf81..2a6f6265d 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -38,15 +38,15 @@ QUICKREF
 
 int 
 _DEFUN (strncasecmp, (s1, s2, n),
-	_CONST char *s1,
-	_CONST char *s2,
+	const char *s1,
+	const char *s2,
 	size_t n)
 {
   int d = 0;
   for ( ; n != 0; n--)
     {
-      _CONST int c1 = tolower(*s1++);
-      _CONST int c2 = tolower(*s2++);
+      const int c1 = tolower(*s1++);
+      const int c2 = tolower(*s2++);
       if (((d = c1 - c2) != 0) || (c2 == '\0'))
         break;
     }
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index f800221c6..2411cf124 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -60,7 +60,7 @@ QUICKREF
 char *
 _DEFUN (strncat, (s1, s2, n),
 	char *__restrict s1,
-	_CONST char *__restrict s2,
+	const char *__restrict s2,
 	size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 98a31d32b..685d19290 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -53,8 +53,8 @@ QUICKREF
 
 int 
 _DEFUN (strncmp, (s1, s2, n),
-	_CONST char *s1,
-	_CONST char *s2,
+	const char *s1,
+	const char *s2,
 	size_t n)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index 91b274590..abbe43bc7 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -61,12 +61,12 @@ QUICKREF
 char *
 _DEFUN (strncpy, (dst0, src0),
 	char *__restrict dst0,
-	_CONST char *__restrict src0,
+	const char *__restrict src0,
 	size_t count)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
   char *dscan;
-  _CONST char *sscan;
+  const char *sscan;
 
   dscan = dst0;
   sscan = src0;
@@ -82,9 +82,9 @@ _DEFUN (strncpy, (dst0, src0),
   return dst0;
 #else
   char *dst = dst0;
-  _CONST char *src = src0;
+  const char *src = src0;
   long *aligned_dst;
-  _CONST long *aligned_src;
+  const long *aligned_src;
 
   /* If SRC and DEST is aligned and count large enough, then copy words.  */
   if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index 64e9ae68e..c241ca544 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -7,7 +7,7 @@
 
 char *
 _DEFUN (strndup, (str, n), 
-	_CONST char *str,
+	const char *str,
 	size_t n)
 {
   return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index c8ec072fa..3c7e8ee4f 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -5,10 +5,10 @@
 char *
 _DEFUN (_strndup_r, (reent_ptr, str, n), 
         struct _reent *reent_ptr,
-        _CONST char   *str,
+        const char   *str,
         size_t n)
 {
-  _CONST char *ptr = str;
+  const char *ptr = str;
   size_t len;
   char *copy;
 
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 4978f726d..42f460fea 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -31,10 +31,10 @@ PORTABILITY
 
 size_t
 _DEFUN (strnlen, (str, n),
-	_CONST char *str,
+	const char *str,
 	size_t n)
 {
-  _CONST char *start = str;
+  const char *start = str;
 
   while (n-- > 0 && *str)
     str++;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f589fbdac..f70efc1ea 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -26,10 +26,10 @@ PORTABILITY
 
 char *
 _DEFUN (strpbrk, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *c = s2;
+  const char *c = s2;
   if (!*s1)
     return (char *) NULL;
 
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 721bb91dc..4aafd509a 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -31,10 +31,10 @@ QUICKREF
 
 char *
 _DEFUN (strrchr, (s, i),
-	_CONST char *s,
+	const char *s,
 	int i)
 {
-  _CONST char *last = NULL;
+  const char *last = NULL;
 
   if (i)
     {
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 287da4d7e..22ccd0bf8 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -31,11 +31,11 @@ QUICKREF
 
 size_t
 _DEFUN (strspn, (s1, s2),
-	_CONST char *s1,
-	_CONST char *s2)
+	const char *s1,
+	const char *s2)
 {
-  _CONST char *s = s1;
-  _CONST char *c;
+  const char *s = s1;
+  const char *c;
 
   while (*s1)
     {
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 94fe297e7..749edbce6 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -40,8 +40,8 @@ QUICKREF
 
 char *
 _DEFUN (strstr, (searchee, lookfor),
-	_CONST char *searchee,
-	_CONST char *lookfor)
+	const char *searchee,
+	const char *lookfor)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
 
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 55b81b335..13c51becf 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -48,7 +48,7 @@ QUICKREF
 size_t
 _DEFUN (strxfrm, (s1, s2, n),
 	char *__restrict s1,
-	_CONST char *__restrict s2,
+	const char *__restrict s2,
 	size_t n)
 {
   size_t res;
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index b08066875..1c14a4c48 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -19,7 +19,7 @@ PORTABILITY
 
 void
 _DEFUN (swab, (b1, b2, length),
-	_CONST void *b1,
+	const void *b1,
 	void *b2,
 	ssize_t length)
 {
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 0fda226e7..942fad19c 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -28,7 +28,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcpcpy, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   while ((*s1++ = *s2++))
     ;
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index f643b1e43..11f4d7c1f 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -35,7 +35,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcpncpy, (dst, src, count),
 	wchar_t *__restrict dst,
-	_CONST wchar_t *__restrict src,
+	const wchar_t *__restrict src,
 	size_t count)
 {
   wchar_t *ret = NULL;
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index f23e37227..483754997 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -37,8 +37,8 @@ QUICKREF
 
 int
 _DEFUN (wcscasecmp, (s1, s2),
-	_CONST wchar_t *s1,
-	_CONST wchar_t *s2)
+	const wchar_t *s1,
+	const wchar_t *s2)
 {
   int d = 0;
   for ( ; ; )
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 900c3cc52..40b7774e5 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -63,11 +63,11 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcscat, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   wchar_t *p;
   wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *r;
 
   p = s1;
   while (*p)
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index 7590009e9..f883f5443 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcschr, (s, c),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   do
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index f14eb5d8d..1fb35755c 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -68,8 +68,8 @@ No supporting OS subroutines are required.
  */
 int
 _DEFUN (wcscmp, (s1, s2),
-	_CONST wchar_t * s1,
-	_CONST wchar_t * s2)
+	const wchar_t * s1,
+	const wchar_t * s2)
 {
 
   while (*s1 == *s2++)
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 27a12456e..7d6b927f8 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -34,8 +34,8 @@ PORTABILITY
 
 int
 _DEFUN (wcscoll, (a, b),
-	_CONST wchar_t *a,
-	_CONST wchar_t *b)
+	const wchar_t *a,
+	const wchar_t *b)
 
 {
   return wcscmp (a, b);
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 2dff63996..679e9c543 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcscpy, (s1, s2),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2)
+	const wchar_t *__restrict s2)
 {
   wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *q;
 
   *s1 = '\0';
   p = s1;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 355499699..54bca2fa7 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcscspn, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 1015c4c36..dd96d3049 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -70,11 +70,11 @@ No supporting OS subroutines are required.
 size_t
 _DEFUN (wcslcat, (dst, src, siz),
 	wchar_t * dst,
-	_CONST wchar_t * src,
+	const wchar_t * src,
 	size_t siz)
 {
   wchar_t *d = dst;
-  _CONST wchar_t *s = src;
+  const wchar_t *s = src;
   size_t n = siz;
   size_t dlen;
 
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 396dda71a..a21f8c8fc 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -64,11 +64,11 @@ No supporting OS subroutines are required.
 size_t
 _DEFUN (wcslcpy, (dst, src, siz),
 	wchar_t * dst,
-	_CONST wchar_t * src,
+	const wchar_t * src,
 	size_t siz)
 {
   wchar_t *d = dst;
-  _CONST wchar_t *s = src;
+  const wchar_t *s = src;
   size_t n = siz;
 
   /* Copy as many bytes as will fit */
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index ebef17285..c92757708 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -56,9 +56,9 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcslen, (s),
-	_CONST wchar_t * s)
+	const wchar_t * s)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 90f310158..7abb154ee 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
 
 int 
 _DEFUN (wcsncasecmp, (s1, s2, n),
-	_CONST wchar_t *s1,
-	_CONST wchar_t *s2,
+	const wchar_t *s1,
+	const wchar_t *s2,
 	size_t n)
 {
   int d = 0;
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 57dc9031b..3c344b46e 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -64,12 +64,12 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcsncat, (s1, s2, n),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2,
+	const wchar_t *__restrict s2,
 	size_t n)
 {
   wchar_t *p;
   wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *r;
 
   p = s1;
   while (*p)
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 83b899d84..2dc7660f4 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (wcsncmp, (s1, s2, n),
-	_CONST wchar_t * s1,
-	_CONST wchar_t * s2,
+	const wchar_t * s1,
+	const wchar_t * s2,
 	size_t n)
 {
 
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index d09b95df7..324dad3a2 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -37,7 +37,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wcsncpy, (s1, s2, n),
 	wchar_t *__restrict s1,
-	_CONST wchar_t *__restrict s2,
+	const wchar_t *__restrict s2,
 	size_t n)
 {
   wchar_t *dscan=s1;
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index e9715e749..cc7d66e10 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -53,10 +53,10 @@ PORTABILITY
 
 size_t
 _DEFUN(wcsnlen, (s, maxlen), 
-                 _CONST wchar_t *s,
+                 const wchar_t *s,
                  size_t maxlen)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p && maxlen-- > 0)
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index b4d8230cc..ecda7affe 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -58,11 +58,11 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcspbrk, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index 68f1e28b6..f12ccc202 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -61,10 +61,10 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wcsrchr, (s, c),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c)
 {
-  _CONST wchar_t *p;
+  const wchar_t *p;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 8e8ce6c69..196816821 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
 
 size_t
 _DEFUN (wcsspn, (s, set),
-	_CONST wchar_t * s,
-	_CONST wchar_t * set)
+	const wchar_t * s,
+	const wchar_t * set)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
+  const wchar_t *p;
+  const wchar_t *q;
 
   p = s;
   while (*p)
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index 2fdec0f97..d5a031452 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -62,12 +62,12 @@ PORTABILITY
 
 wchar_t *
 _DEFUN (wcsstr, (big, little),
-	_CONST wchar_t *__restrict big,
-	_CONST wchar_t *__restrict little)
+	const wchar_t *__restrict big,
+	const wchar_t *__restrict little)
 {
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-  _CONST wchar_t *r;
+  const wchar_t *p;
+  const wchar_t *q;
+  const wchar_t *r;
 
   if (!*little)
     {
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 3764883a9..19abfd92d 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -35,7 +35,7 @@ PORTABILITY
 
 int
 _DEFUN (wcswidth, (pwcs, n),
-	_CONST wchar_t *pwcs,
+	const wchar_t *pwcs,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 6911b21e2..78d7da566 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -38,7 +38,7 @@ PORTABILITY
 size_t
 _DEFUN (wcsxfrm, (a, b, n),
 	wchar_t *__restrict a,
-	_CONST wchar_t *__restrict b,
+	const wchar_t *__restrict b,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index acb15d0dc..a8c73a542 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -164,7 +164,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
 
 int
 _DEFUN (__wcwidth, (ucs),
-	_CONST wint_t ucs)
+	const wint_t ucs)
 {
 #ifdef _MB_CAPABLE
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -330,7 +330,7 @@ _DEFUN (__wcwidth, (ucs),
 
 int     
 _DEFUN (wcwidth, (wc),
-	_CONST wchar_t wc)
+	const wchar_t wc)
 { 
   wint_t wi = wc;
 
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 2a6f8e1a4..8db2f64cc 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -64,7 +64,7 @@ No supporting OS subroutines are required.
 
 wchar_t *
 _DEFUN (wmemchr, (s, c, n),
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index bfe1e69b4..abb9ed6ff 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
 
 int
 _DEFUN (wmemcmp, (s1, s2, n),
-	_CONST wchar_t * s1,
-	_CONST wchar_t * s2,
+	const wchar_t * s1,
+	const wchar_t * s2,
 	size_t n)
 {
   size_t i;
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index 9e4fdc517..ad1aa24bc 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -63,7 +63,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmemcpy, (d, s, n),
 	wchar_t *__restrict d,
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	size_t n)
 {
 
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 567f55afd..22b5a987d 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -68,7 +68,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmemmove, (d, s, n),
 	wchar_t * d,
-	_CONST wchar_t * s,
+	const wchar_t * s,
 	size_t n)
 {
 
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index f11485262..7354e81da 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
 wchar_t *
 _DEFUN (wmempcpy, (d, s, n),
 	wchar_t *__restrict d,
-	_CONST wchar_t *__restrict s,
+	const wchar_t *__restrict s,
 	size_t n)
 {
   return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t));