[dovecot-cvs] dovecot-sieve/src/libsieve comparator.c, 1.1.1.1, 1.2 message.c, 1.1.1.1, 1.2 sievec.c, 1.1.1.1, 1.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot-sieve/src/libsieve
In directory talvi:/tmp/cvs-serv18318

Modified Files:
	comparator.c message.c sievec.c 
Log Message:
__attribute__((unused)) -> __attr_unused__ so it now compiles with non-gcc



Index: comparator.c
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/src/libsieve/comparator.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- comparator.c	11 Jun 2006 11:03:53 -0000	1.1.1.1
+++ comparator.c	10 Oct 2006 17:01:14 -0000	1.2
@@ -33,6 +33,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "xmalloc.h"
 #include "comparator.h"
 #include "tree.h"
 #include "sieve.h"
@@ -146,7 +147,7 @@
 
 /* we do a brute force attack */
 static int octet_contains(const char *text, const char *pat, 
-                          void *rock __attribute__((unused)))
+                          void *rock __attr_unused__)
 {
     return (strstr(text, pat) != NULL);
 }
@@ -213,7 +214,7 @@
 }
 
 static int octet_matches(const char *text, const char *pat, 
-                         void *rock __attribute__((unused)))
+                         void *rock __attr_unused__)
 {
     return octet_matches_(text, pat, 0);
 }
@@ -221,7 +222,7 @@
 
 #ifdef ENABLE_REGEX
 static int octet_regex(const char *text, const char *pat, 
-                       void *rock __attribute__((unused)))
+                       void *rock __attr_unused__)
 {
     return (!regexec((regex_t *) pat, text, 0, NULL, 0));
 }
@@ -235,7 +236,7 @@
 
 /* sheer brute force */
 static int ascii_casemap_contains(const char *text, const char *pat,
-				  void *rock __attribute__((unused)))
+				  void *rock __attr_unused__)
 {
     int N = strlen(text);
     int M = strlen(pat);
@@ -255,7 +256,7 @@
 }
 
 static int ascii_casemap_matches(const char *text, const char *pat, 
-                                 void *rock __attribute__((unused)))
+                                 void *rock __attr_unused__)
 {
     return octet_matches_(text, pat, 1);
 }

Index: message.c
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/src/libsieve/message.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- message.c	11 Jun 2006 11:03:53 -0000	1.1.1.1
+++ message.c	10 Oct 2006 17:01:15 -0000	1.2
@@ -434,7 +434,7 @@
 }
 
 char *get_address(address_part_t addrpart,
-		  void **data __attribute__((unused)),
+		  void **data __attr_unused__,
 		  void **marker,
 		  int canon_domain)
 {

Index: sievec.c
===================================================================
RCS file: /var/lib/cvs/dovecot-sieve/src/libsieve/sievec.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sievec.c	11 Jun 2006 11:03:54 -0000	1.1.1.1
+++ sievec.c	10 Oct 2006 17:01:15 -0000	1.2
@@ -142,18 +142,18 @@
     (sieve_callback *) &foo	/* send_response() */
 };
 
-static int sieve_notify(void *ac __attribute__((unused)), 
-			void *interp_context __attribute__((unused)), 
-			void *script_context __attribute__((unused)),
-			void *message_context __attribute__((unused)),
-			const char **errmsg __attribute__((unused)))
+static int sieve_notify(void *ac __attr_unused__, 
+			void *interp_context __attr_unused__, 
+			void *script_context __attr_unused__,
+			void *message_context __attr_unused__,
+			const char **errmsg __attr_unused__)
 {
     i_fatal("stub function called");
     return SIEVE_FAIL;
 }
 
 static int mysieve_error(int lineno, const char *msg,
-			 void *i __attribute__((unused)), void *s)
+			 void *i __attr_unused__, void *s)
 {
     char buf[1024];
     char **errstr = (char **) s;