From de7ba135e202b097722bbaeeb526649575c00836 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Wed, 6 Oct 1993 00:24:28 +0000
Subject: [PATCH] merge with 3.8.3a

---
 lib/fsusage.c  | 2 +-
 lib/makepath.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 9307a40b5a..2f1179b231 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -70,7 +70,7 @@ adjust_blocks (blocks, fromsize, tosize)
   else if (fromsize > tosize)	/* E.g., from 2048 to 512.  */
     return blocks * (fromsize / tosize);
   else				/* E.g., from 256 to 512.  */
-    return (blocks + (blocks < 0 ? -1 : +1)) / (tosize / fromsize);
+    return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
 }
 
 /* Fill in the fields of FSP with information about space usage for
diff --git a/lib/makepath.c b/lib/makepath.c
index e61579021c..7699c178df 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -38,8 +38,15 @@ char *alloca ();
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
+#ifdef	STAT_MACROS_BROKEN
+#ifdef S_ISDIR
+#undef S_ISDIR
+#endif
+#endif	/* STAT_MACROS_BROKEN.  */
+
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define	S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 #ifdef STDC_HEADERS
-- 
2.30.2