aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2017-03-23 15:45:00 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2017-03-23 15:48:59 -0300
commitca4dc7465917beeb37af32891d4c867b5ac16883 (patch)
tree62b5c44f4eb26c890054de150b92d22cb6690b3f
parentfb82116f24454e450f771a41f18cbdacfae1229d (diff)
downloadglibc-ca4dc7465917beeb37af32891d4c867b5ac16883.zip
glibc-ca4dc7465917beeb37af32891d4c867b5ac16883.tar.gz
glibc-ca4dc7465917beeb37af32891d4c867b5ac16883.tar.bz2
Change the order of function attributes in printf.h
ISO C++ section 8.3.5 [dcl.fct] requires exception specifications to appear before attribute specifiers in function declarations. This patch fixes issues reported by stdio-common/check-installed-headers-cxx. * stdio-common/printf.h (register_printf_modifier): Change the order of __wur and __THROW. (register_printf_type): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--stdio-common/printf.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5769bf5..86599d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-23 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
+
+ * stdio-common/printf.h (register_printf_modifier): Change the
+ order of __wur and __THROW.
+ (register_printf_type): Likewise.
+
2017-03-23 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com>
* string/test-string.h (TEST_FUNCTION): Use test_main instead of
diff --git a/stdio-common/printf.h b/stdio-common/printf.h
index bf5ccd4..5d82e8d 100644
--- a/stdio-common/printf.h
+++ b/stdio-common/printf.h
@@ -111,13 +111,13 @@ 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) __THROW __wur;
/* Register variable argument handler for user type. The return value
is to be used in ARGINFO functions to signal the use of the
type. */
-extern int register_printf_type (printf_va_arg_function __fct) __wur __THROW;
+extern int register_printf_type (printf_va_arg_function __fct) __THROW __wur;
/* Parse FMT, and fill in N elements of ARGTYPES with the