summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2010-06-07 18:09:07 +0000
committerPhil Pennock <pdp@exim.org>2010-06-07 18:09:07 +0000
commit2a137616793c7fe657cd8b78aba480f682264733 (patch)
tree461d15abaeceadac7c6b0382b1c35a9c647f74ba /src
parent71265ae92dbf3153c8d4803d1621a5aad70250ef (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/src/buildconfig.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index b53869cf1..3cd9b2924 100644
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.17 2010/06/07 00:12:42 pdp Exp $ */
+/* $Cambridge: 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 @@ main(int argc, char **argv)
{
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 @@ with C99 not being ubiquitous yet. Unfortunately. */
#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))