From 4ea58045e251e911174c3af6ccfe92f426d709bd Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 2 Feb 2006 22:24:33 +0000
Subject: [PATCH] Moved the potential disabling of __attribute__ above the
 relocated UNUSED() define.

---
 rsync.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/rsync.h b/rsync.h
index b6038f73..a61315e2 100644
--- a/rsync.h
+++ b/rsync.h
@@ -648,6 +648,13 @@ struct chmod_mode_struct;
 #include "lib/permstring.h"
 #include "lib/addrinfo.h"
 
+#if !defined __GNUC__ || defined __APPLE__
+/* Apparently the OS X port of gcc gags on __attribute__.
+ *
+ * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
+#define __attribute__(x)
+#endif
+
 #define UNUSED(x) x __attribute__((__unused__))
 
 #include "proto.h"
@@ -806,14 +813,6 @@ extern int errno;
 /* handler for null strings in printf format */
 #define NS(s) ((s)?(s):"<NULL>")
 
-#if !defined __GNUC__ || defined __APPLE__
-/* Apparently the OS X port of gcc gags on __attribute__.
- *
- * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */
-#define __attribute__(x)
-
-#endif
-
 /* Convenient wrappers for malloc and realloc.  Use them. */
 #define new(type) ((type *)malloc(sizeof(type)))
 #define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
-- 
2.34.1