* lib/acl.h: Include sys/types.h and sys/stat.h, for mode_t and

struct stat.  Problem reported by Henning Nielsen Lund.
* lib/acl.c: Include acl.h first, to check interface.  Don't
bother to include sys/types.h and sys/stat.h again.

diff --git a/ChangeLog b/ChangeLog
index 5e56c758bc62077b328d715b1fca2ceb06f734bd..b5b09067b93b17de0989fc8342aae68e1f956bc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/acl.h: Include sys/types.h and sys/stat.h, for mode_t and
+       struct stat.  Problem reported by Henning Nielsen Lund.
+       * lib/acl.c: Include acl.h first, to check interface.  Don't
+       bother to include sys/types.h and sys/stat.h again.
+
 2006-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        Import the following change from libc; problem reported by

diff --git a/lib/acl.c b/lib/acl.c
index 803be0da87f013d71bb60829e854b9327059c5fe..0b3cd6f1d936e6955bf845319463185df51e9237 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -20,11 +20,11 @@
 
 #include <config.h>
 
+#include "acl.h"
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #ifndef S_ISLNK
 # define S_ISLNK(Mode) 0
 #endif
@@ -33,7 +33,6 @@
 # include <acl/libacl.h>
 #endif
 
-#include "acl.h"
 #include "error.h"
 #include "quote.h"
 

diff --git a/lib/acl.h b/lib/acl.h
index a7b4f9eecb80d6017330c554326d3826bb4757cc..11f2667e7b6ffd1b18bfcae83ba3bbd87ce11b3c 100644 (file)
--- a/lib/acl.h
+++ b/lib/acl.h
@@ -25,6 +25,9 @@
 # define GETACLCNT ACL_CNT
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 int file_has_acl (char const *, struct stat const *);
 int copy_acl (char const *, int, char const *, int, mode_t);
 int set_acl (char const *, int, mode_t);