Mercurial > gnulib
changeset 10109:29794e333189
Move some declarations from acl.h to acl-internal.h.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 23 May 2008 00:14:21 +0200 |
| parents | bf329a08180c |
| children | d16d40824464 |
| files | ChangeLog lib/acl-internal.h lib/acl.h |
| diffstat | 3 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 23 00:13:07 2008 +0200 +++ b/ChangeLog Fri May 23 00:14:21 2008 +0200 @@ -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.
--- a/lib/acl-internal.h Fri May 23 00:13:07 2008 +0200 +++ b/lib/acl-internal.h Fri May 23 00:14:21 2008 +0200 @@ -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
--- a/lib/acl.h Fri May 23 00:13:07 2008 +0200 +++ b/lib/acl.h Fri May 23 00:14:21 2008 +0200 @@ -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 *);