* dwarf2.h: Mention the location of the DWARF3 spec on the web.

[deliverable/binutils-gdb.git] / binutils / strings.c

diff --git a/binutils/strings.c b/binutils/strings.c
index 2238574bac04a760096847e681ca2a8db78e137e..c1e20770d11087ce2cfe718c2b4177277e922156 100644 (file)
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -4,7 +4,7 @@
 
    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
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -593,14 +593,12 @@ print_strings (const char *filename, FILE *stream, file_off address,
          case 8:
 #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
            if (sizeof (start) > sizeof (long))
-             printf ("%7Lo ", (unsigned long long) start);
+             printf ("%7llo ", (unsigned long long) start);
            else
-#else
-# if !BFD_HOST_64BIT_LONG
+#elif !BFD_HOST_64BIT_LONG
            if (start != (unsigned long) start)
              printf ("++%7lo ", (unsigned long) start);
            else
-# endif
 #endif
              printf ("%7lo ", (unsigned long) start);
            break;
@@ -608,14 +606,12 @@ print_strings (const char *filename, FILE *stream, file_off address,
          case 10:
 #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
            if (sizeof (start) > sizeof (long))
-             printf ("%7Ld ", (unsigned long long) start);
+             printf ("%7lld ", (unsigned long long) start);
            else
-#else
-# if !BFD_HOST_64BIT_LONG
+#elif !BFD_HOST_64BIT_LONG
            if (start != (unsigned long) start)
              printf ("++%7ld ", (unsigned long) start);
            else
-# endif
 #endif
              printf ("%7ld ", (long) start);
            break;
@@ -623,15 +619,13 @@ print_strings (const char *filename, FILE *stream, file_off address,
          case 16:
 #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
            if (sizeof (start) > sizeof (long))
-             printf ("%7Lx ", (unsigned long long) start);
+             printf ("%7llx ", (unsigned long long) start);
            else
-#else
-# if !BFD_HOST_64BIT_LONG
+#elif !BFD_HOST_64BIT_LONG
            if (start != (unsigned long) start)
              printf ("%lx%8.8lx ", (unsigned long) (start >> 32),
                      (unsigned long) (start & 0xffffffff));
            else
-# endif
 #endif
              printf ("%7lx ", (unsigned long) start);
            break;