X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffsusage.c;h=337bf5315d97a2fa1c35b06c6f45300270c820f9;hb=5d95b32a83f1663be6172f07b21ba7615b6055f4;hp=0bb62244755bd8fab46d0b01f8e199dc216e2511;hpb=79c0a43808d9ca85acd04600149fc1a9b75bd1b9;p=gnulib.git

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 0bb622447..337bf5315 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -17,9 +17,7 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "fsusage.h"
 
@@ -58,9 +56,10 @@
 # include "full-read.h"
 #endif
 
-#ifndef UINTMAX_MAX
-# define UINTMAX_MAX ((uintmax_t) -1)
-#endif
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 /* Many space usage primitives use all 1 bits to denote a value that is
    not applicable or unknown.  Propagate this information by returning
@@ -71,7 +70,7 @@
     && (~ (x) == (sizeof (x) < sizeof (int) \
 		  ? - (1 << (sizeof (x) * CHAR_BIT)) \
 		  : 0))) \
-   ? UINTMAX_MAX : (x))
+   ? UINTMAX_MAX : (uintmax_t) (x))
 
 /* Extract the top bit of X as an uintmax_t value.  */
 #define EXTRACT_TOP_BIT(x) ((x) \