pdp 2010/06/07 19:09:07 BST
Modified files:
exim-src/src buildconfig.c
Log:
For the new SIZE_T_FMT, if not C99 then our size_t conversion specifier
should use PRIdMAX; this was disabled because I was testing the other logic
and forgot to restore before commit. Bleh, sorry.
Add #if to protect against unused variable complaints for this too.
Revision Changes Path
1.18 +3 -2 exim/exim-src/src/buildconfig.c
Index: buildconfig.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/buildconfig.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- buildconfig.c 7 Jun 2010 00:12:42 -0000 1.17
+++ buildconfig.c 7 Jun 2010 18:09:07 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.17 2010/06/07 00:12:42 pdp Exp $ */
+/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.18 2010/06/07 18:09:07 pdp Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -104,8 +104,10 @@
{
off_t test_off_t = 0;
time_t test_time_t = 0;
+#if !(__STDC_VERSION__ >= 199901L) && !defined(PRIdMAX)
size_t test_size_t = 0;
unsigned long test_ulong_t = 0L;
+#endif
long test_long_t = 0;
FILE *base;
FILE *new;
@@ -185,8 +187,7 @@
#if __STDC_VERSION__ >= 199901L
fprintf(new, "#define SIZE_T_FMT \"%%zu\"\n");
#else
-/*# ifdef PRIdMAX */
-#if 0
+# ifdef PRIdMAX
fprintf(new, "#define SIZE_T_FMT \"%%" PRIdMAX "\"\n");
# else
if (sizeof(test_size_t) > sizeof (test_ulong_t))
