From: marta <marta@onelab7.(none)>
Date: Fri, 21 Jan 2011 11:42:43 +0000 (+0100)
Subject: Undefine the __unused macro around problematic places.
X-Git-Tag: ipfw-0.9-20~1
X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=commitdiff_plain;h=5c0e07e8063f1dfece9930846786143d6aea5f4e

Undefine the __unused macro around problematic places.
---

diff --git a/ipfw/ipfw2.c b/ipfw/ipfw2.c
index 9e2dd59..6cb826b 100644
--- a/ipfw/ipfw2.c
+++ b/ipfw/ipfw2.c
@@ -40,7 +40,14 @@
 #include <time.h>	/* ctime */
 #include <timeconv.h>	/* _long_to_time */
 #include <unistd.h>
+/*
+ * FreeBSD uses __unused as a shorthand for __attribute__ ((__unused__))
+ * whereas Linux sometimes uses __unused as a variable name.
+ * undefine the macro around problematic places.
+ */
+#undef __unused
 #include <fcntl.h>
+#define __unused       __attribute__ ((__unused__))
 
 #include <net/ethernet.h>
 #include <net/if.h>		/* only IFNAMSIZ */