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.

diff --git a/ChangeLog b/ChangeLog
index 5769bf5512162b50b28af1f4247b8c91167613a9..86599d7b385f32d5038360545e5d15600f35d86c 100644 (file)
--- 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 bf5ccd4dd0f5d854412874c98d14ae170066d5b2..5d82e8d01ef414b27b5c6435e883ef7861be7024 100644 (file)
--- 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