From: Jim Meyering <jim@meyering.net>
Date: Thu, 27 Oct 1994 13:43:59 +0000 (+0000)
Subject: merge with 3.9s
X-Git-Tag: textutils-1_12_1~500
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6b8bdc529eb7d8393eec2a7542c9fd3cf44dcd4;p=thirdparty%2Fcoreutils.git

merge with 3.9s
---

diff --git a/lib/fsusage.c b/lib/fsusage.c
index f326c37592..e8c1bfca1d 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include "fsusage.h"
 #include "safe-stat.h"
 
@@ -50,7 +51,6 @@ int statfs ();
 #endif
 
 #ifdef HAVE_DUSTAT_H		/* AIX PS/2.  */
-#include <sys/stat.h>
 #include <sys/dustat.h>
 #endif
 
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index a65f9ed955..c28f8722ed 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -5,7 +5,7 @@ Thu Oct 27 00:02:45 1994  Jim Meyering  (meyering@comco.com)
 
 	* df.c: New option: --sync (-s).  No longer perform sync by default.
 	Do it only when this option is used.  Invoking sync can be very
-	expensive, and it's not that clear doing so yields more up to date
+	expensive, and it's not clear that doing so yields more up to date
 	results.  With encouragement/prodding from Paolo Zeppegno
 	(paolo@to.sem.it), Nick Holloway, and Kaveh Ghazi.