Turn the errors for use of strstr and similar into conditional warnings.

[gnulib.git] / lib / acl.c

diff --git a/lib/acl.c b/lib/acl.c
index b5c1ee9..0b3cd6f 100644 (file)
--- a/lib/acl.c
+++ b/lib/acl.c
@@ -1,6 +1,6 @@
 /* acl.c - access control lists
 
-   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006 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,15 +18,13 @@
 
    Written by Paul Eggert and Andreas Gruenbacher.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#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
@@ -35,7 +33,6 @@
 # include <acl/libacl.h>
 #endif
 
-#include "acl.h"
 #include "error.h"
 #include "quote.h"
 
@@ -83,7 +80,7 @@
 # define acl_from_mode(mode) (NULL)
 #endif
 
-/* We detect presence of POSIX 1003.1e (draft 17 -- abandoned) support
+/* We detect the presence of POSIX 1003.1e (draft 17 -- abandoned) support
    by checking for HAVE_ACL_GET_FILE, HAVE_ACL_SET_FILE, and HAVE_ACL_FREE.
    Systems that have acl_get_file, acl_set_file, and acl_free must also
    have acl_to_text, acl_from_text, and acl_delete_def_file (all defined