Now that system.h defines is_empty_dir, include "openat.h".

* src/system.h: Include "openat.h" here, ...
* src/chcon.c: ... not here.
* src/chmod.c: Likewise.
* src/chown-core.c: Likewise.
* src/remove.c: Likewise.

Signed-off-by: Jim Meyering <meyering@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index c3c0209d496d6cb5f145f2da7a03ad899dc57bdc..1079c45ba3c119ac1c538d66ff5aa64a43bb97b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-30  Jim Meyering  <meyering@redhat.com>
 
+       Now that system.h defines is_empty_dir, include "openat.h".
+       * src/system.h: Include "openat.h" here, ...
+       * src/chcon.c: ... not here.
+       * src/chmod.c: Likewise.
+       * src/chown-core.c: Likewise.
+       * src/remove.c: Likewise.
+
        * src/c99-to-c89.diff: Adjust remove.c offsets.
 
        Improve "rmdir --ignore-fail-on-non-empty"

diff --git a/src/chcon.c b/src/chcon.c
index ecd5236a64fb36c8609f5b65d04756e995f545a7..4f091a304b2bdb0295121992e9f9b00df14a7412 100644 (file)
--- a/src/chcon.c
+++ b/src/chcon.c
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "dev-ino.h"
 #include "error.h"
-#include "openat.h"
 #include "quote.h"
 #include "quotearg.h"
 #include "root-dev-ino.h"

diff --git a/src/chmod.c b/src/chmod.c
index a22e5c127fc5078ca3c8561c037c05f9daa6906c..9f307e508c6b57ccc3c102153e7052a24d75a188 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -1,5 +1,5 @@
 /* chmod -- change permission modes of files
-   Copyright (C) 89, 90, 91, 1995-2007 Free Software Foundation, Inc.
+   Copyright (C) 89, 90, 91, 1995-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
@@ -26,7 +26,6 @@
 #include "error.h"
 #include "filemode.h"
 #include "modechange.h"
-#include "openat.h"
 #include "quote.h"
 #include "quotearg.h"
 #include "root-dev-ino.h"

diff --git a/src/chown-core.c b/src/chown-core.c
index 9768652a206b97a018b24ff5c00eda75ae20f27d..9c43b21b430c90cbbee44554b06e02ad0bea829e 100644 (file)
--- a/src/chown-core.c
+++ b/src/chown-core.c
@@ -26,7 +26,6 @@
 #include "chown-core.h"
 #include "error.h"
 #include "inttostr.h"
-#include "openat.h"
 #include "quote.h"
 #include "root-dev-ino.h"
 #include "xfts.h"

diff --git a/src/remove.c b/src/remove.c
index fe603bbc09d9e47c074c0bbfd264001841159449..1658fb9900b6c95508d8ad28e10e19e4f73b1f43 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -33,7 +33,6 @@
 #include "hash-pjw.h"
 #include "lstat.h"
 #include "obstack.h"
-#include "openat.h"
 #include "quote.h"
 #include "remove.h"
 #include "root-dev-ino.h"

diff --git a/src/system.h b/src/system.h
index b0b954510aed3991bfa5a3f7e24493373fecdfe5..b640c01df76cc47356c8ce2c47bea6d15a1c136b 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -359,6 +359,7 @@ uid_t getuid ();
 #include "same-inode.h"
 
 #include "dirname.h"
+#include "openat.h"
 
 static inline bool
 dot_or_dotdot (char const *file_name)