* src/od.c: Now that HAVE_UNSIGNED_LONG_LONG is no longer defined

in config.h, change the uses to HAVE_UNSIGNED_LONG_LONG_INT.
Otherwise, on a system with 4-byte longs, "od -t u8" fails with this:
od: invalid type string `u8';
this system doesn't provide a 8-byte integral type
FIXME: add a test for this, but skip it when sizeof uintmax < 8.

diff --git a/ChangeLog b/ChangeLog
index 8dab9d4607afa1599fb6683d5f3bedcaee2db3e4..1953799b2f383a7e390f638c8ddd1d92b76a80b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-21  Jim Meyering  <jim@meyering.net>
+
+       * src/od.c: Now that HAVE_UNSIGNED_LONG_LONG is no longer defined
+       in config.h, change the uses to HAVE_UNSIGNED_LONG_LONG_INT.
+       Otherwise, on a system with 4-byte longs, "od -t u8" fails with this:
+       od: invalid type string `u8';
+       this system doesn't provide a 8-byte integral type
+       FIXME: add a test for this, but skip it when sizeof uintmax < 8.
+
 2006-08-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        Add a bootstrap procedure, so that the CVS version contains fewer

diff --git a/src/od.c b/src/od.c
index fe4da7ed1856b685929c1c8db314c057fe7d7400..7c0b5b792e497f1b8a4e1b6bf34fbe9dca6e287a 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -1,5 +1,5 @@
 /* od -- dump files in octal and other formats
-   Copyright (C) 92, 1995-2005 Free Software Foundation, Inc.
+   Copyright (C) 92, 1995-2006 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
@@ -59,7 +59,7 @@ typedef double LONG_DOUBLE;
 # define LDBL_DIG DBL_DIG
 #endif
 
-#if HAVE_UNSIGNED_LONG_LONG
+#if HAVE_UNSIGNED_LONG_LONG_INT
 typedef unsigned long long int unsigned_long_long_int;
 #else
 /* This is just a place-holder to avoid a few `#if' directives.
@@ -1581,7 +1581,7 @@ main (int argc, char **argv)
   integral_type_size[sizeof (short int)] = SHORT;
   integral_type_size[sizeof (int)] = INT;
   integral_type_size[sizeof (long int)] = LONG;
-#if HAVE_UNSIGNED_LONG_LONG
+#if HAVE_UNSIGNED_LONG_LONG_INT
   /* If `long int' and `long long int' have the same size, it's fine
      to overwrite the entry for `long' with this one.  */
   integral_type_size[sizeof (unsigned_long_long_int)] = LONG_LONG;