about summary refs log tree commit diff
path: root/string/bits/string3.h
diff options
context:
space:
mode:
Diffstat (limited to 'string/bits/string3.h')
-rw-r--r--string/bits/string3.h27
1 files changed, 13 insertions, 14 deletions
diff --git a/string/bits/string3.h b/string/bits/string3.h
index 164772572b..cdc01db53c 100644
--- a/string/bits/string3.h
+++ b/string/bits/string3.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007, 2009, 2010, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -46,21 +46,21 @@ __warndecl (__warn_memset_zero_len,
 
 
 __extern_always_inline void *
-__NTH (memcpy (void *__restrict __dest, __const void *__restrict __src,
+__NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
 	       size_t __len))
 {
   return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest));
 }
 
 __extern_always_inline void *
-__NTH (memmove (void *__dest, __const void *__src, size_t __len))
+__NTH (memmove (void *__dest, const void *__src, size_t __len))
 {
   return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
 }
 
 #ifdef __USE_GNU
 __extern_always_inline void *
-__NTH (mempcpy (void *__restrict __dest, __const void *__restrict __src,
+__NTH (mempcpy (void *__restrict __dest, const void *__restrict __src,
 		size_t __len))
 {
   return __builtin___mempcpy_chk (__dest, __src, __len, __bos0 (__dest));
@@ -87,7 +87,7 @@ __NTH (memset (void *__dest, int __ch, size_t __len))
 
 #ifdef __USE_BSD
 __extern_always_inline void
-__NTH (bcopy (__const void *__src, void *__dest, size_t __len))
+__NTH (bcopy (const void *__src, void *__dest, size_t __len))
 {
   (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
 }
@@ -100,14 +100,14 @@ __NTH (bzero (void *__dest, size_t __len))
 #endif
 
 __extern_always_inline char *
-__NTH (strcpy (char *__restrict __dest, __const char *__restrict __src))
+__NTH (strcpy (char *__restrict __dest, const char *__restrict __src))
 {
   return __builtin___strcpy_chk (__dest, __src, __bos (__dest));
 }
 
 #ifdef __USE_GNU
 __extern_always_inline char *
-__NTH (stpcpy (char *__restrict __dest, __const char *__restrict __src))
+__NTH (stpcpy (char *__restrict __dest, const char *__restrict __src))
 {
   return __builtin___stpcpy_chk (__dest, __src, __bos (__dest));
 }
@@ -115,21 +115,20 @@ __NTH (stpcpy (char *__restrict __dest, __const char *__restrict __src))
 
 
 __extern_always_inline char *
-__NTH (strncpy (char *__restrict __dest, __const char *__restrict __src,
+__NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
 		size_t __len))
 {
   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
 }
 
 // XXX We have no corresponding builtin yet.
-extern char *__stpncpy_chk (char *__dest, __const char *__src, size_t __n,
+extern char *__stpncpy_chk (char *__dest, const char *__src, size_t __n,
 			    size_t __destlen) __THROW;
-extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest,
-					       __const char *__src,
+extern char *__REDIRECT_NTH (__stpncpy_alias, (char *__dest, const char *__src,
 					       size_t __n), stpncpy);
 
 __extern_always_inline char *
-__NTH (stpncpy (char *__dest, __const char *__src, size_t __n))
+__NTH (stpncpy (char *__dest, const char *__src, size_t __n))
 {
   if (__bos (__dest) != (size_t) -1
       && (!__builtin_constant_p (__n) || __n <= __bos (__dest)))
@@ -139,14 +138,14 @@ __NTH (stpncpy (char *__dest, __const char *__src, size_t __n))
 
 
 __extern_always_inline char *
-__NTH (strcat (char *__restrict __dest, __const char *__restrict __src))
+__NTH (strcat (char *__restrict __dest, const char *__restrict __src))
 {
   return __builtin___strcat_chk (__dest, __src, __bos (__dest));
 }
 
 
 __extern_always_inline char *
-__NTH (strncat (char *__restrict __dest, __const char *__restrict __src,
+__NTH (strncat (char *__restrict __dest, const char *__restrict __src,
 		size_t __len))
 {
   return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest));