Move some declarations from acl.h to acl-internal.h.

diff --git a/ChangeLog b/ChangeLog
index 1c11e4a7506b99bf90d2e4ce8ef5d1e0baabfff3..9bbd1e9cf3faf224438a5ebdad6889f281aa46ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-22  Bruno Haible  <bruno@clisp.org>
+
+       * lib/acl.h: Don't include <sys/acl.h>.
+       (GETACLCNT): Move fallback to lib/acl-internal.h.
+       * lib/acl-internal.h: Include <sys/acl.h> here.
+       (GETACLCNT): New macro fallback, moved here from lib/acl.h.
+
 2008-05-22  Bruno Haible  <bruno@clisp.org>
 
        Split off copy_acl function to separate file.

diff --git a/lib/acl-internal.h b/lib/acl-internal.h
index 36b9cedca16c1a378ce5b52cbd308bf3a5ae60be..c23d6f4e1134d3e1d873b58134d732c88159c142 100644 (file)
--- a/lib/acl-internal.h
+++ b/lib/acl-internal.h
@@ -1,6 +1,6 @@
 /* Internal implementation of access control lists.
 
-   Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,6 +22,15 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
+/* All systems define the ACL related API in <sys/acl.h>.  */
+#if HAVE_SYS_ACL_H
+# include <sys/acl.h>
+#endif
+#if defined HAVE_ACL && ! defined GETACLCNT && defined ACL_CNT
+# define GETACLCNT ACL_CNT
+#endif
+
+/* On Linux, additional ACL related API is available in <acl/libacl.h>.  */
 #ifdef HAVE_ACL_LIBACL_H
 # include <acl/libacl.h>
 #endif

diff --git a/lib/acl.h b/lib/acl.h
index 00cc60d90d46dfa4499f6ea0461d07c73263086e..fcb00f5ae1ace34bc7bc789c73e0eba8ad99d842 100644 (file)
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,14 +18,6 @@
    Written by Paul Eggert.  */
 
 #include <sys/types.h>
-
-#if HAVE_SYS_ACL_H
-# include <sys/acl.h>
-#endif
-#if defined HAVE_ACL && ! defined GETACLCNT && defined ACL_CNT
-# define GETACLCNT ACL_CNT
-#endif
-
 #include <sys/stat.h>
 
 int file_has_acl (char const *, struct stat const *);