X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Farglist.h;h=7628f6816e5b3eb0fa1b578e41aa935cbb463d25;hb=HEAD;hp=1c87202cda094d6697c0d9bd8607691273584140;hpb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;p=debian%2Famanda

diff --git a/common-src/arglist.h b/common-src/arglist.h
index 1c87202..7628f68 100644
--- a/common-src/arglist.h
+++ b/common-src/arglist.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +25,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: arglist.h,v 1.7 2002/12/03 21:36:39 martinea Exp $
+ * $Id: arglist.h,v 1.9 2006/06/16 11:33:43 martinea Exp $
  *
  * support macros for variable argument list declaration and definition
  */
@@ -38,13 +39,13 @@
 
 #define printf_arglist_function(fdecl, \
 				hook_type, hook_name) \
-	__attribute__ ((format (printf, 1, 0))) \
+        G_GNUC_PRINTF(1,0) \
         fdecl(hook_type hook_name, ...)
 
 #define printf_arglist_function1(fdecl, \
 				 arg1_type, arg1_name, \
 				 hook_type, hook_name) \
-	__attribute__ ((format (printf, 2, 0))) \
+        G_GNUC_PRINTF(2,0) \
 	fdecl(arg1_type arg1_name, \
 	      hook_type hook_name, ...)
 
@@ -52,11 +53,22 @@
 				 arg1_type, arg1_name, \
 				 arg2_type, arg2_name, \
 				 hook_type, hook_name) \
-	__attribute__ ((format (printf, 3, 0))) \
+        G_GNUC_PRINTF(3,0) \
 	fdecl(arg1_type arg1_name, \
 	      arg2_type arg2_name, \
 	      hook_type hook_name, ...)
 
+#define printf_arglist_function3(fdecl, \
+				 arg1_type, arg1_name, \
+				 arg2_type, arg2_name, \
+				 arg3_type, arg3_name, \
+				 hook_type, hook_name) \
+        G_GNUC_PRINTF(4,0) \
+        fdecl(arg1_type arg1_name, \
+	      arg2_type arg2_name, \
+	      arg3_type arg3_name, \
+	      hook_type hook_name, ...)
+
 #define arglist_function(fdecl, \
 			 hook_type, hook_name) \
         fdecl(hook_type hook_name, ...)