Improved use of gcc __attribute__.

ChangeLog

+2012-09-07  Niels Möller  <nisse@lysator.liu.se>
+
+	* examples/nettle-benchmark.c (die): Add NORETURN attribute. Patch
+	from Tim Rühsen.
+	* tools/misc.h (die, werror): Use PRINTF_STYLE and NORETURN macros
+	for attributes. Patch from Tim Rühsen.
+
+	* examples/io.h (werror): Use PRINTF_STYLE macro.
+
 2012-08-22  Niels Möller  <nisse@lysator.liu.se>
 
 	From Sam Thursfield <sam.thursfield@codethink.co.uk>:

examples/io.h

@@ -37,11 +37,7 @@ void *
 xalloc(size_t size);
 
 void
-werror(const char *format, ...)
-#if __GNUC___
-     __attribute__((__format__ (__printf__,1, 2)))
-#endif
-     ;
+werror(const char *format, ...) PRINTF_STYLE(1, 2);
 
 /* If size is > 0, read at most that many bytes. If size == 0,
  * read until EOF. Allocates the buffer dynamically. */

examples/nettle-benchmark.c

@@ -96,7 +96,7 @@ static double frequency = 0.0;
 #define BENCH_ITERATIONS 10
 #endif
 
-static void
+static void NORETURN
 die(const char *format, ...)
 {
   va_list args;

tools/misc.h

@@ -28,19 +28,10 @@
 #endif
 
 void
-die(const char *format, ...)
-#if __GNUC___
-     __attribute__((__format__ (__printf__,1, 2)))
-     __attribute__((__noreturn__))
-#endif
-     ;
+die(const char *format, ...) PRINTF_STYLE (1, 2) NORETURN;
 
 void
-werror(const char *format, ...)
-#if __GNUC___
-     __attribute__((__format__ (__printf__,1, 2)))
-#endif
-     ;
+werror(const char *format, ...) PRINTF_STYLE (1, 2);
 
 void *
 xalloc(size_t size);