about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/stdio-common/printf.h b/stdio-common/printf.h
index af8cf34fcc..274fd9a437 100644
--- a/stdio-common/printf.h
+++ b/stdio-common/printf.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2001,2006,2009
+/* Copyright (C) 1991-1993,1995-2001,2006,2009,2012
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -66,8 +66,8 @@ struct printf_info
    or -1 for errors.  */
 
 typedef int printf_function (FILE *__stream,
-			     __const struct printf_info *__info,
-			     __const void *__const *__args);
+			     const struct printf_info *__info,
+			     const void *const *__args);
 
 /* Type of a printf specifier-arginfo function.
    INFO gives information about the format specification.
@@ -77,13 +77,13 @@ typedef int printf_function (FILE *__stream,
    this case.  This allows to partially overwrite the functionality
    of existing format specifiers.  */
 
-typedef int printf_arginfo_size_function (__const struct printf_info *__info,
+typedef int printf_arginfo_size_function (const struct printf_info *__info,
 					  size_t __n, int *__argtypes,
 					  int *__size);
 
 /* Old version of 'printf_arginfo_function' without a SIZE parameter.  */
 
-typedef int printf_arginfo_function (__const struct printf_info *__info,
+typedef int printf_arginfo_function (const struct printf_info *__info,
 				     size_t __n, int *__argtypes);
 
 /* Type of a function to get a value of a user-defined from the
@@ -113,7 +113,7 @@ extern int register_printf_function (int __spec, printf_function __func,
    it returns a positive value representing the bit set in the USER
    field in 'struct printf_info'.  */
 
-extern int register_printf_modifier (__const wchar_t *__str) __wur __THROW;
+extern int register_printf_modifier (const wchar_t *__str) __wur __THROW;
 
 
 /* Register variable argument handler for user type.  The return value
@@ -133,7 +133,7 @@ extern int register_printf_type (printf_va_arg_function __fct) __wur __THROW;
    array it is passed with the types of the arguments it wants, and return
    the number of arguments it wants.  */
 
-extern size_t parse_printf_format (__const char *__restrict __fmt, size_t __n,
+extern size_t parse_printf_format (const char *__restrict __fmt, size_t __n,
 				   int *__restrict __argtypes) __THROW;
 
 
@@ -173,11 +173,11 @@ enum
    the format specifier is a uppercase character powers of 1000 are
    used.  Otherwise powers of 1024.  */
 extern int printf_size (FILE *__restrict __fp,
-			__const struct printf_info *__info,
-			__const void *__const *__restrict __args) __THROW;
+			const struct printf_info *__info,
+			const void *const *__restrict __args) __THROW;
 
 /* This is the appropriate argument information function for `printf_size'.  */
-extern int printf_size_info (__const struct printf_info *__restrict
+extern int printf_size_info (const struct printf_info *__restrict
 			     __info, size_t __n, int *__restrict __argtypes)
      __THROW;