diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 23:57:22 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-07 23:57:22 -0500 |
| commit | a784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch) | |
| tree | 5ebaa084119dcffe41671a62e2e799b172c57d24 /misc/bits | |
| parent | 33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff) | |
| download | glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.gz glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.xz glibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.zip | |
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'misc/bits')
| -rw-r--r-- | misc/bits/error.h | 20 | ||||
| -rw-r--r-- | misc/bits/syslog.h | 10 |
2 files changed, 15 insertions, 15 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); } |