Remove logic branch which can use PRIdMAX for SIZE_T_FMT because it fails

when size_t is 32-bit but the system supports 64-bit integers.

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 38ed0311f170d62fff599d83584d47f1dc1c5876..7e2790bb81a7855310e65a336d8094b142aca935 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.20 2010/06/12 15:21:26 jetmore Exp $ */
+/* $Cambridge: exim/src/src/buildconfig.c,v 1.21 2010/06/13 08:26:40 pdp Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -34,7 +34,6 @@ normally called independently. */
 
 
 #include <ctype.h>
 
 
 #include <ctype.h>

-#include <inttypes.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -104,10 +103,8 @@ main(int argc, char **argv)
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;
 {
 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;
 size_t test_size_t = 0;
 unsigned long test_ulong_t = 0L;

-#endif

 long test_long_t = 0;
 FILE *base;
 FILE *new;
 long test_long_t = 0;
 FILE *base;
 FILE *new;


@@ -187,14 +184,10 @@ with C99 not being ubiquitous yet.  Unfortunately. */
 #if __STDC_VERSION__ >= 199901L
 fprintf(new, "#define SIZE_T_FMT  \"%%zu\"\n");
 #else
 #if __STDC_VERSION__ >= 199901L
 fprintf(new, "#define SIZE_T_FMT  \"%%zu\"\n");
 #else

-# ifdef PRIdMAX
-fprintf(new, "#define SIZE_T_FMT  \"%%" PRIdMAX "\"\n");
-# else

 if (sizeof(test_size_t) > sizeof (test_ulong_t))
   fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
 else
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");
 if (sizeof(test_size_t) > sizeof (test_ulong_t))
   fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
 else
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");

-# endif

 #endif
 
 /* Now search the makefile for certain settings */
 #endif
 
 /* Now search the makefile for certain settings */