add bitmask for sec_vt_command

[metze/wireshark/wip.git] / cmdarg_err.h

diff --git a/cmdarg_err.h b/cmdarg_err.h
index 0d7670f9cf97206e7a5a7a327a4a9b66c80693a9..c6fd42b62d28a2be3a9800c38544f45c227fadd3 100644 (file)
--- a/cmdarg_err.h
+++ b/cmdarg_err.h
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -19,12 +19,14 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __CMDARG_ERR_H__
 #define __CMDARG_ERR_H__
 
+#include <glib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -32,22 +34,14 @@ extern "C" {
 /*
  * 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
+    G_GNUC_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
+    G_GNUC_PRINTF(1, 2);
 
 #ifdef __cplusplus
 }