* lib/fsusage.c (PROPAGATE_ALL_ONES): Don't assume uintmax_t is

at least as wide as intmax_t.

diff --git a/ChangeLog b/ChangeLog
index addf6ef8d75cb6066721db02f933ad7bdea0d3cc..9a5beab58869e16aed71bae2b91fa1c78728984b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/fsusage.c (PROPAGATE_ALL_ONES): Don't assume uintmax_t is
+       at least as wide as intmax_t.
+
 2006-10-16  Alexandre Duret-Lutz  <adl@gnu.org>
 
        (Imported from Automake.)

diff --git a/lib/fsusage.c b/lib/fsusage.c
index c9721ca7ee3037c2dbcd8316f587480770e8fbf2..7d84a9ff7469896c69b1c7652759bbddc3f8c318 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -61,11 +61,11 @@
    a uintmax_t value that is all 1 bits if X is all 1 bits, even if X
    is unsigned and narrower than uintmax_t.  */
 #define PROPAGATE_ALL_ONES(x) \
-  ((sizeof (x) < sizeof (uintmax_t) \
+  ((sizeof (x) != sizeof (uintmax_t) \
     && (~ (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) \