From: Bruno Haible <bruno@clisp.org>
Date: Mon, 13 Jun 2011 09:19:42 +0000 (+0200)
Subject: file-set.h: guard __attibute__ use, now that it's not always defined
X-Git-Tag: v0.1~2620
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=258036d8674583fce2002a04afc996f18c8b8486;p=gnulib.git

file-set.h: guard __attibute__ use, now that it's not always defined

* lib/file-set.h (record_file): Use __attribute__ only with compiler
versions that support it.  This fixes a coreutils build failure with
/bin/cc on HP-UX 11.31.
---

diff --git a/ChangeLog b/ChangeLog
index 7af3f05bf..e4a4a70f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-13  Bruno Haible  <bruno@clisp.org>
+
+	file-set.h: guard __attibute__ use, now that it's not always defined
+	* lib/file-set.h (record_file): Use __attribute__ only with compiler
+	versions that support it.  This fixes a coreutils build failure with
+	/bin/cc on HP-UX 11.31.
+
 2011-06-12  Bruno Haible  <bruno@clisp.org>
 
 	acl: Add support for HP-UX >= 11.11 JFS ACLs.
diff --git a/lib/file-set.h b/lib/file-set.h
index 28d42fecf..4e47d95a1 100644
--- a/lib/file-set.h
+++ b/lib/file-set.h
@@ -6,7 +6,10 @@
 
 extern void record_file (Hash_table *ht, char const *file,
                          struct stat const *stats)
-  __attribute__ ((nonnull (2, 3)));
+#if defined __GNUC__ && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3)
+  __attribute__ ((nonnull (2, 3)))
+#endif
+;
 
 extern bool seen_file (Hash_table const *ht, char const *file,
                        struct stat const *stats);