diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-17 12:43:43 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-12-17 12:43:43 -0800 |
| commit | e9ad5665ede9f7599b7b26a7e478fd3e56ddf36e (patch) | |
| tree | ce45512be929919b0c1e0c34bfb6dcb313c645aa /lib/file-has-acl.c | |
| parent | 2d6b6005bcf3cc4ece90c0d19a645ca3ae1940ea (diff) | |
| download | emacs-e9ad5665ede9f7599b7b26a7e478fd3e56ddf36e.tar.gz | |
Merge from gnulib, incorporating:
2013-12-17 gettimeofday: port recent C++ fix to Emacs
2013-12-17 gettimeofday: fix C++ crosscompilation
2013-12-17 qacl: port to Windows better
* lib/file-has-acl.c, lib/time.in.h, m4/gettimeofday.m4, m4/time_h.m4:
Update from gnulib.
* lib/gnulib.mk: Regenerate.
Diffstat (limited to 'lib/file-has-acl.c')
| -rw-r--r-- | lib/file-has-acl.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index bb8bae12861..53ac317c0ba 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -75,8 +75,7 @@ acl_access_nontrivial (acl_t acl) } return got_one; -# else /* IRIX, Tru64 */ -# if HAVE_ACL_TO_SHORT_TEXT /* IRIX */ +# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */ /* Don't use acl_get_entry: it is undocumented. */ int count = acl->acl_cnt; @@ -93,8 +92,7 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif -# if HAVE_ACL_FREE_TEXT /* Tru64 */ +# elif HAVE_ACL_FREE_TEXT /* Tru64 */ /* Don't use acl_get_entry: it takes only one argument and does not work. */ int count = acl->acl_num; @@ -117,7 +115,10 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif +# else + + errno = ENOSYS; + return -1; # endif } |