about summary refs log tree commit diff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/bits/error.h20
-rw-r--r--misc/bits/syslog.h10
-rw-r--r--misc/err.h18
-rw-r--r--misc/error.h8
-rw-r--r--misc/fstab.h4
-rw-r--r--misc/mntent.h10
-rw-r--r--misc/regexp.h12
-rw-r--r--misc/search.h18
-rw-r--r--misc/sgtty.h4
-rw-r--r--misc/sys/cdefs.h6
-rw-r--r--misc/sys/mman.h10
-rw-r--r--misc/sys/syslog.h6
-rw-r--r--misc/sys/uio.h19
-rw-r--r--misc/sys/xattr.h28
-rw-r--r--misc/ttyent.h2
15 files changed, 86 insertions, 89 deletions
diff --git a/misc/bits/error.h b/misc/bits/error.h
index 799a3f18bf..16633cd649 100644
--- a/misc/bits/error.h
+++ b/misc/bits/error.h
@@ -1,5 +1,5 @@
 /* Specializations for error functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 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
@@ -23,11 +23,11 @@
 
 
 extern void __REDIRECT (__error_alias, (int __status, int __errnum,
-					__const char *__format, ...),
+					const char *__format, ...),
 			error)
   __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __REDIRECT (__error_noreturn, (int __status, int __errnum,
-					   __const char *__format, ...),
+					   const char *__format, ...),
 			error)
   __attribute__ ((__noreturn__, __format__ (__printf__, 3, 4)));
 
@@ -35,7 +35,7 @@ extern void __REDIRECT (__error_noreturn, (int __status, int __errnum,
 /* If we know the function will never return make sure the compiler
    realizes that, too.  */
 __extern_always_inline void
-error (int __status, int __errnum, __const char *__format, ...)
+error (int __status, int __errnum, const char *__format, ...)
 {
   if (__builtin_constant_p (__status) && __status != 0)
     __error_noreturn (__status, __errnum, __format, __va_arg_pack ());
@@ -45,15 +45,15 @@ error (int __status, int __errnum, __const char *__format, ...)
 
 
 extern void __REDIRECT (__error_at_line_alias, (int __status, int __errnum,
-						__const char *__fname,
+						const char *__fname,
 						unsigned int __line,
-						__const char *__format, ...),
+						const char *__format, ...),
 			error_at_line)
   __attribute__ ((__format__ (__printf__, 5, 6)));
 extern void __REDIRECT (__error_at_line_noreturn, (int __status, int __errnum,
-						   __const char *__fname,
+						   const char *__fname,
 						   unsigned int __line,
-						   __const char *__format,
+						   const char *__format,
 						   ...),
 			error_at_line)
   __attribute__ ((__noreturn__, __format__ (__printf__, 5, 6)));
@@ -62,8 +62,8 @@ extern void __REDIRECT (__error_at_line_noreturn, (int __status, int __errnum,
 /* If we know the function will never return make sure the compiler
    realizes that, too.  */
 __extern_always_inline void
-error_at_line (int __status, int __errnum, __const char *__fname,
-	       unsigned int __line,__const char *__format, ...)
+error_at_line (int __status, int __errnum, const char *__fname,
+	       unsigned int __line, const char *__format, ...)
 {
   if (__builtin_constant_p (__status) && __status != 0)
     __error_at_line_noreturn (__status, __errnum, __fname, __line, __format,
diff --git a/misc/bits/syslog.h b/misc/bits/syslog.h
index 5d64d7acb8..faf47fbc68 100644
--- a/misc/bits/syslog.h
+++ b/misc/bits/syslog.h
@@ -1,5 +1,5 @@
 /* Checking macros for syslog functions.
-   Copyright (C) 2005, 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 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
@@ -22,12 +22,12 @@
 #endif
 
 
-extern void __syslog_chk (int __pri, int __flag, __const char *__fmt, ...)
+extern void __syslog_chk (int __pri, int __flag, const char *__fmt, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 
 #ifdef __va_arg_pack
 __extern_always_inline void
-syslog (int __pri, __const char *__fmt, ...)
+syslog (int __pri, const char *__fmt, ...)
 {
   __syslog_chk (__pri, __USE_FORTIFY_LEVEL - 1, __fmt, __va_arg_pack ());
 }
@@ -38,12 +38,12 @@ syslog (int __pri, __const char *__fmt, ...)
 
 
 #ifdef __USE_BSD
-extern void __vsyslog_chk (int __pri, int __flag, __const char *__fmt,
+extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
 			   __gnuc_va_list __ap)
      __attribute__ ((__format__ (__printf__, 3, 0)));
 
 __extern_always_inline void
-vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
+vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
 {
   __vsyslog_chk (__pri,  __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
 }
diff --git a/misc/err.h b/misc/err.h
index 7ff3553ab3..28dd44e991 100644
--- a/misc/err.h
+++ b/misc/err.h
@@ -1,5 +1,5 @@
 /* 4.4BSD utility functions for error messages.
-   Copyright (C) 1995,1996,1997,1998,1999,2003 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1997,1998,1999,2003,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
@@ -32,25 +32,25 @@ __BEGIN_DECLS
 
 /* Print "program: ", FORMAT, ": ", the standard error string for errno,
    and a newline, on stderr.  */
-extern void warn (__const char *__format, ...)
+extern void warn (const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarn (__const char *__format, __gnuc_va_list)
+extern void vwarn (const char *__format, __gnuc_va_list)
      __attribute__ ((__format__ (__printf__, 1, 0)));
 
 /* Likewise, but without ": " and the standard error string.  */
-extern void warnx (__const char *__format, ...)
+extern void warnx (const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarnx (__const char *__format, __gnuc_va_list)
+extern void vwarnx (const char *__format, __gnuc_va_list)
      __attribute__ ((__format__ (__printf__, 1, 0)));
 
 /* Likewise, and then exit with STATUS.  */
-extern void err (int __status, __const char *__format, ...)
+extern void err (int __status, const char *__format, ...)
      __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
-extern void verr (int __status, __const char *__format, __gnuc_va_list)
+extern void verr (int __status, const char *__format, __gnuc_va_list)
      __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
-extern void errx (int __status, __const char *__format, ...)
+extern void errx (int __status, const char *__format, ...)
      __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
-extern void verrx (int __status, __const char *, __gnuc_va_list)
+extern void verrx (int __status, const char *, __gnuc_va_list)
      __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
 
 __END_DECLS
diff --git a/misc/error.h b/misc/error.h
index 00321e4c3d..4759d43889 100644
--- a/misc/error.h
+++ b/misc/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995,1996,1997,2003,2006,2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997,2003,2006,2007,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
@@ -29,11 +29,11 @@ __BEGIN_DECLS
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
    If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
 
-extern void error (int __status, int __errnum, __const char *__format, ...)
+extern void error (int __status, int __errnum, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 
-extern void error_at_line (int __status, int __errnum, __const char *__fname,
-			   unsigned int __lineno, __const char *__format, ...)
+extern void error_at_line (int __status, int __errnum, const char *__fname,
+			   unsigned int __lineno, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 5, 6)));
 
 /* If NULL, error will flush stdout, then print on stderr the program
diff --git a/misc/fstab.h b/misc/fstab.h
index 24ecad7dbc..9f17e1b96a 100644
--- a/misc/fstab.h
+++ b/misc/fstab.h
@@ -69,8 +69,8 @@ struct fstab
 __BEGIN_DECLS
 
 extern struct fstab *getfsent (void) __THROW;
-extern struct fstab *getfsspec (__const char *__name) __THROW;
-extern struct fstab *getfsfile (__const char *__name) __THROW;
+extern struct fstab *getfsspec (const char *__name) __THROW;
+extern struct fstab *getfsfile (const char *__name) __THROW;
 extern int setfsent (void) __THROW;
 extern void endfsent (void) __THROW;
 
diff --git a/misc/mntent.h b/misc/mntent.h
index a82e9539af..15e7360819 100644
--- a/misc/mntent.h
+++ b/misc/mntent.h
@@ -1,5 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 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
@@ -64,7 +64,7 @@ struct mntent
 
 /* Prepare to begin reading and/or writing mount table entries from the
    beginning of FILE.  MODE is as for `fopen'.  */
-extern FILE *setmntent (__const char *__file, __const char *__mode) __THROW;
+extern FILE *setmntent (const char *__file, const char *__mode) __THROW;
 
 /* Read one mount table entry from STREAM.  Returns a pointer to storage
    reused on the next call, or null for EOF or error (use feof/ferror to
@@ -82,15 +82,15 @@ extern struct mntent *getmntent_r (FILE *__restrict __stream,
 /* Write the mount table entry described by MNT to STREAM.
    Return zero on success, nonzero on failure.  */
 extern int addmntent (FILE *__restrict __stream,
-		      __const struct mntent *__restrict __mnt) __THROW;
+		      const struct mntent *__restrict __mnt) __THROW;
 
 /* Close a stream opened with `setmntent'.  */
 extern int endmntent (FILE *__stream) __THROW;
 
 /* Search MNT->mnt_opts for an option matching OPT.
    Returns the address of the substring, or null if none found.  */
-extern char *hasmntopt (__const struct mntent *__mnt,
-			__const char *__opt) __THROW;
+extern char *hasmntopt (const struct mntent *__mnt,
+			const char *__opt) __THROW;
 
 
 __END_DECLS
diff --git a/misc/regexp.h b/misc/regexp.h
index 0e979d2d87..5c7a161dbc 100644
--- a/misc/regexp.h
+++ b/misc/regexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2004, 2008
+/* Copyright (C) 1996, 1997, 1998, 1999, 2004, 2008, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -101,7 +101,7 @@ extern char *locs;
    on the macros.  */
 char *
 compile (char *__restrict instring, char *__restrict expbuf,
-	 __const char *__restrict endbuf, int eof)
+	 const char *__restrict endbuf, int eof)
 {
   char *__input_buffer = NULL;
   size_t __input_size = 0;
@@ -213,14 +213,14 @@ compile (char *__restrict instring, char *__restrict expbuf,
    found in the buffer starting at EXPBUF.  `loc1' will return the
    first character matched and `loc2' points to the next unmatched
    character.  */
-extern int step (__const char *__restrict __string,
-		 __const char *__restrict __expbuf) __THROW;
+extern int step (const char *__restrict __string,
+		 const char *__restrict __expbuf) __THROW;
 
 /* Match the beginning of STRING with the compiled regular expression
    in EXPBUF.  If the match is successful `loc2' will contain the
    position of the first unmatched character.  */
-extern int advance (__const char *__restrict __string,
-		    __const char *__restrict __expbuf) __THROW;
+extern int advance (const char *__restrict __string,
+		    const char *__restrict __expbuf) __THROW;
 
 
 __END_DECLS
diff --git a/misc/search.h b/misc/search.h
index 2ffba697b0..a3610be7db 100644
--- a/misc/search.h
+++ b/misc/search.h
@@ -1,5 +1,5 @@
 /* Declarations for System V style searching functions.
-   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 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
@@ -52,7 +52,7 @@ extern void remque (void *__elem) __THROW;
 /* For use with hsearch(3).  */
 #ifndef __COMPAR_FN_T
 # define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (__const void *, __const void *);
+typedef int (*__compar_fn_t) (const void *, const void *);
 
 # ifdef	__USE_GNU
 typedef __compar_fn_t comparison_fn_t;
@@ -127,28 +127,28 @@ VISIT;
 
 /* Search for an entry matching the given KEY in the tree pointed to
    by *ROOTP and insert a new element if not found.  */
-extern void *tsearch (__const void *__key, void **__rootp,
+extern void *tsearch (const void *__key, void **__rootp,
 		      __compar_fn_t __compar);
 
 /* Search for an entry matching the given KEY in the tree pointed to
    by *ROOTP.  If no matching entry is available return NULL.  */
-extern void *tfind (__const void *__key, void *__const *__rootp,
+extern void *tfind (const void *__key, void *const *__rootp,
 		    __compar_fn_t __compar);
 
 /* Remove the element matching KEY from the tree pointed to by *ROOTP.  */
-extern void *tdelete (__const void *__restrict __key,
+extern void *tdelete (const void *__restrict __key,
 		      void **__restrict __rootp,
 		      __compar_fn_t __compar);
 
 #ifndef __ACTION_FN_T
 # define __ACTION_FN_T
-typedef void (*__action_fn_t) (__const void *__nodep, VISIT __value,
+typedef void (*__action_fn_t) (const void *__nodep, VISIT __value,
 			       int __level);
 #endif
 
 /* Walk through the whole tree and call the ACTION callback for every node
    or leaf.  */
-extern void twalk (__const void *__root, __action_fn_t __action);
+extern void twalk (const void *__root, __action_fn_t __action);
 
 #ifdef __USE_GNU
 /* Callback type for function to free a tree node.  If the keys are atomic
@@ -162,12 +162,12 @@ extern void tdestroy (void *__root, __free_fn_t __freefct);
 
 /* Perform linear search for KEY by comparing by COMPAR in an array
    [BASE,BASE+NMEMB*SIZE).  */
-extern void *lfind (__const void *__key, __const void *__base,
+extern void *lfind (const void *__key, const void *__base,
 		    size_t *__nmemb, size_t __size, __compar_fn_t __compar);
 
 /* Perform linear search for KEY by comparing by COMPAR function in
    array [BASE,BASE+NMEMB*SIZE) and insert entry if not found.  */
-extern void *lsearch (__const void *__key, void *__base,
+extern void *lsearch (const void *__key, void *__base,
 		      size_t *__nmemb, size_t __size, __compar_fn_t __compar);
 
 __END_DECLS
diff --git a/misc/sgtty.h b/misc/sgtty.h
index 5b2bc41849..a73646dba3 100644
--- a/misc/sgtty.h
+++ b/misc/sgtty.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1996,1998,1999,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
@@ -33,7 +33,7 @@ __BEGIN_DECLS
 extern int gtty (int __fd, struct sgttyb *__params) __THROW;
 
 /* Set the terminal parameters associated with FD to *PARAMS.  */
-extern int stty (int __fd, __const struct sgttyb *__params) __THROW;
+extern int stty (int __fd, const struct sgttyb *__params) __THROW;
 
 
 __END_DECLS
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index c856e87a07..cf55dbe676 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2001, 2002, 2004, 2005, 2006, 2007, 2009, 2011
+/* Copyright (C) 1992-2002, 2004, 2005, 2006, 2007, 2009, 2011, 2012
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -77,10 +77,6 @@
 # define __THROWNL
 # define __NTH(fct)	fct
 
-# define __const	const
-# define __signed	signed
-# define __volatile	volatile
-
 #endif	/* GCC.  */
 
 /* These two macros are not used in glibc anymore.  They are kept here
diff --git a/misc/sys/mman.h b/misc/sys/mman.h
index 4cd8a3fe72..9f0f63eb49 100644
--- a/misc/sys/mman.h
+++ b/misc/sys/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for BSD-style memory management.
-   Copyright (C) 1994-2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2003-2005, 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
@@ -101,10 +101,10 @@ extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW;
 
 /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to
    be memory resident.  */
-extern int mlock (__const void *__addr, size_t __len) __THROW;
+extern int mlock (const void *__addr, size_t __len) __THROW;
 
 /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN).  */
-extern int munlock (__const void *__addr, size_t __len) __THROW;
+extern int munlock (const void *__addr, size_t __len) __THROW;
 
 /* Cause all currently mapped pages of the process to be memory resident
    until unlocked by a call to the `munlockall', until the process exits,
@@ -142,10 +142,10 @@ extern int remap_file_pages (void *__start, size_t __size, int __prot,
 
 
 /* Open shared memory segment.  */
-extern int shm_open (__const char *__name, int __oflag, mode_t __mode);
+extern int shm_open (const char *__name, int __oflag, mode_t __mode);
 
 /* Remove shared memory segment.  */
-extern int shm_unlink (__const char *__name);
+extern int shm_unlink (const char *__name);
 
 __END_DECLS
 
diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h
index 22da1ce3e9..aed419e446 100644
--- a/misc/sys/syslog.h
+++ b/misc/sys/syslog.h
@@ -178,7 +178,7 @@ extern void closelog (void);
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern void openlog (__const char *__ident, int __option, int __facility);
+extern void openlog (const char *__ident, int __option, int __facility);
 
 /* Set the log mask level.  */
 extern int setlogmask (int __mask) __THROW;
@@ -187,7 +187,7 @@ extern int setlogmask (int __mask) __THROW;
 
    This function is a possible cancellation point and therefore not
    marked with __THROW.  */
-extern void syslog (int __pri, __const char *__fmt, ...)
+extern void syslog (int __pri, const char *__fmt, ...)
      __attribute__ ((__format__ (__printf__, 2, 3)));
 
 #ifdef __USE_BSD
@@ -197,7 +197,7 @@ extern void syslog (int __pri, __const char *__fmt, ...)
    cancellation point.  But due to similarity with an POSIX interface
    or due to the implementation it is a cancellation point and
    therefore not marked with __THROW.  */
-extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap)
+extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
      __attribute__ ((__format__ (__printf__, 2, 0)));
 #endif
 
diff --git a/misc/sys/uio.h b/misc/sys/uio.h
index a32b7ed8e5..299d320f44 100644
--- a/misc/sys/uio.h
+++ b/misc/sys/uio.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1996-1999,2003,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1996-1999,2003,2009,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
@@ -37,7 +38,7 @@ __BEGIN_DECLS
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count)
+extern ssize_t readv (int __fd, const struct iovec *__iovec, int __count)
   __wur;
 
 /* Write data pointed by the buffers described by IOVEC, which
@@ -48,7 +49,7 @@ extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count)
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count)
+extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count)
   __wur;
 
 
@@ -63,7 +64,7 @@ extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count)
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t preadv (int __fd, __const struct iovec *__iovec, int __count,
+extern ssize_t preadv (int __fd, const struct iovec *__iovec, int __count,
 		       __off_t __offset) __wur;
 
 /* Write data pointed by the buffers described by IOVEC, which is a
@@ -75,14 +76,14 @@ extern ssize_t preadv (int __fd, __const struct iovec *__iovec, int __count,
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count,
+extern ssize_t pwritev (int __fd, const struct iovec *__iovec, int __count,
 			__off_t __offset) __wur;
 # else
 #  ifdef __REDIRECT
-extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec,
+extern ssize_t __REDIRECT (preadv, (int __fd, const struct iovec *__iovec,
 				    int __count, __off64_t __offset),
 			   preadv64) __wur;
-extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec,
+extern ssize_t __REDIRECT (pwritev, (int __fd, const struct iovec *__iovec,
 				     int __count, __off64_t __offset),
 			   pwritev64) __wur;
 #  else
@@ -101,7 +102,7 @@ extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec,
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t preadv64 (int __fd, __const struct iovec *__iovec, int __count,
+extern ssize_t preadv64 (int __fd, const struct iovec *__iovec, int __count,
 			 __off64_t __offset) __wur;
 
 /* Write data pointed by the buffers described by IOVEC, which is a
@@ -113,7 +114,7 @@ extern ssize_t preadv64 (int __fd, __const struct iovec *__iovec, int __count,
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
-extern ssize_t pwritev64 (int __fd, __const struct iovec *__iovec, int __count,
+extern ssize_t pwritev64 (int __fd, const struct iovec *__iovec, int __count,
 			  __off64_t __offset) __wur;
 # endif
 #endif	/* Use BSD */
diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
index 2737f90bde..e03db5db14 100644
--- a/misc/sys/xattr.h
+++ b/misc/sys/xattr.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 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
@@ -37,48 +37,48 @@ enum
 
 /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern int setxattr (__const char *__path, __const char *__name,
-		     __const void *__value, size_t __size, int __flags)
+extern int setxattr (const char *__path, const char *__name,
+		     const void *__value, size_t __size, int __flags)
 	__THROW;
 
 /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long), not following symlinks for the last pathname component.
    Return 0 on success, -1 for errors.  */
-extern int lsetxattr (__const char *__path, __const char *__name,
-		      __const void *__value, size_t __size, int __flags)
+extern int lsetxattr (const char *__path, const char *__name,
+		      const void *__value, size_t __size, int __flags)
 	__THROW;
 
 /* Set the attribute NAME of the file descriptor FD to VALUE (which is SIZE
    bytes long).  Return 0 on success, -1 for errors.  */
-extern int fsetxattr (int __fd, __const char *__name, __const void *__value,
+extern int fsetxattr (int __fd, const char *__name, const void *__value,
 		      size_t __size, int __flags) __THROW;
 
 /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t getxattr (__const char *__path, __const char *__name,
+extern ssize_t getxattr (const char *__path, const char *__name,
 			 void *__value, size_t __size) __THROW;
 
 /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is
    SIZE bytes long), not following symlinks for the last pathname component.
    Return 0 on success, -1 for errors.  */
-extern ssize_t lgetxattr (__const char *__path, __const char *__name,
+extern ssize_t lgetxattr (const char *__path, const char *__name,
 			  void *__value, size_t __size) __THROW;
 
 /* Get the attribute NAME of the file descriptor FD to VALUE (which is SIZE
    bytes long).  Return 0 on success, -1 for errors.  */
-extern ssize_t fgetxattr (int __fd, __const char *__name, void *__value,
+extern ssize_t fgetxattr (int __fd, const char *__name, void *__value,
 			  size_t __size) __THROW;
 
 /* List attributes of the file pointed to by PATH into the user-supplied
    buffer LIST (which is SIZE bytes big).  Return 0 on success, -1 for
    errors.  */
-extern ssize_t listxattr (__const char *__path, char *__list, size_t __size)
+extern ssize_t listxattr (const char *__path, char *__list, size_t __size)
 	__THROW;
 
 /* List attributes of the file pointed to by PATH into the user-supplied
    buffer LIST (which is SIZE bytes big), not following symlinks for the
    last pathname component.  Return 0 on success, -1 for errors.  */
-extern ssize_t llistxattr (__const char *__path, char *__list, size_t __size)
+extern ssize_t llistxattr (const char *__path, char *__list, size_t __size)
 	__THROW;
 
 /* List attributes of the file descriptor FD into the user-supplied buffer
@@ -88,16 +88,16 @@ extern ssize_t flistxattr (int __fd, char *__list, size_t __size)
 
 /* Remove the attribute NAME from the file pointed to by PATH.  Return 0
    on success, -1 for errors.  */
-extern int removexattr (__const char *__path, __const char *__name) __THROW;
+extern int removexattr (const char *__path, const char *__name) __THROW;
 
 /* Remove the attribute NAME from the file pointed to by PATH, not
    following symlinks for the last pathname component.  Return 0 on
    success, -1 for errors.  */
-extern int lremovexattr (__const char *__path, __const char *__name) __THROW;
+extern int lremovexattr (const char *__path, const char *__name) __THROW;
 
 /* Remove the attribute NAME from the file descriptor FD.  Return 0 on
    success, -1 for errors.  */
-extern int fremovexattr (int __fd, __const char *__name) __THROW;
+extern int fremovexattr (int __fd, const char *__name) __THROW;
 
 __END_DECLS
 
diff --git a/misc/ttyent.h b/misc/ttyent.h
index 0b221bccfa..fe418a5377 100644
--- a/misc/ttyent.h
+++ b/misc/ttyent.h
@@ -56,7 +56,7 @@ struct ttyent {
 __BEGIN_DECLS
 
 extern struct ttyent *getttyent (void) __THROW;
-extern struct ttyent *getttynam (__const char *__tty) __THROW;
+extern struct ttyent *getttynam (const char *__tty) __THROW;
 extern int setttyent (void) __THROW;
 extern int endttyent (void) __THROW;