Support systems whose <inttypes.h> doesn't define `PRIiMAX'.

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index dca6141..9b4cdd6 100644 (file)
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-02  Ludovic Courtès  <ludo@gnu.org>
+
+       * standalone/test-conversion.c: Support systems whose
+       <inttypes.h> doesn't define `PRIiMAX'.  Reported by Peter
+       O'Gorman <pogma@thewrittenword.com>.
+
 2008-05-31  Ludovic Courtès  <ludo@gnu.org>
 
        * standalone/test-gh.c (string_equal): Use `scm_c_string_length ()'

diff --git a/test-suite/standalone/test-conversion.c b/test-suite/standalone/test-conversion.c
index b8dfab8..92835f2 100644 (file)
--- a/test-suite/standalone/test-conversion.c
+++ b/test-suite/standalone/test-conversion.c
@@ -27,7 +27,9 @@
 
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#elif (!defined PRIiMAX)
+#endif
+
+#ifndef PRIiMAX
 # if (defined SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG >= 8)
 #  define PRIiMAX "lli"
 #  define PRIuMAX "llu"