Use Wireshark/GLib attribute specifiers instead of checking for __GNUC__ explicitly

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29804 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 4 insertions, 10 deletions

diff --git a/cmdarg_err.h b/cmdarg_err.h
index be18da281b..733d7faa76 100644
--- a/cmdarg_err.h
+++ b/cmdarg_err.h
@@ -29,25 +29,19 @@
 extern "C" {
 #endif /* __cplusplus */
 
+#include <epan/gnuc_format_check.h>
+
 /*
  * Report an error in command-line arguments.
  */
-#if __GNUC__ >= 2
 extern void cmdarg_err(const char *fmt, ...)
-    __attribute__((format (printf, 1, 2)));
-#else
-extern void cmdarg_err(const char *fmt, ...);
-#endif
+    GNUC_FORMAT_CHECK(printf, 1, 2);
 
 /*
  * Report additional information for an error in command-line arguments.
  */
-#if __GNUC__ >= 2
 extern void cmdarg_err_cont(const char *fmt, ...)
-    __attribute__((format (printf, 1, 2)));
-#else
-extern void cmdarg_err_cont(const char *fmt, ...);
-#endif
+    GNUC_FORMAT_CHECK(printf, 1, 2);
 
 #ifdef __cplusplus
 }