From: Jim Meyering <meyering@redhat.com>
Date: Wed, 30 Jan 2008 18:29:01 +0000 (+0100)
Subject: Now that system.h defines is_empty_dir, include "openat.h".
X-Git-Tag: v6.11~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839f321fde2e66c6b3568e3cc73a03c3259bd048;p=thirdparty%2Fcoreutils.git

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 c3c0209d49..1079c45ba3 100644
--- 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 ecd5236a64..4f091a304b 100644
--- 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 a22e5c127f..9f307e508c 100644
--- 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 9768652a20..9c43b21b43 100644
--- 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 fe603bbc09..1658fb9900 100644
--- 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 b0b954510a..b640c01df7 100644
--- 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)