[exim-cvs] cvs commit: exim/exim-src/src buildconfig.c

トップ ページ
このメッセージを削除
このメッセージに返信
著者: Phil Pennock
日付:  
To: exim-cvs
題目: [exim-cvs] cvs commit: exim/exim-src/src buildconfig.c
pdp 2010/06/13 09:26:40 BST

  Modified files:
    exim-src/src         buildconfig.c 
  Log:
  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.


  Revision  Changes    Path
  1.21      +0 -7      exim/exim-src/src/buildconfig.c


  Index: buildconfig.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/buildconfig.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- buildconfig.c    12 Jun 2010 15:21:26 -0000    1.20
  +++ buildconfig.c    13 Jun 2010 08:26:40 -0000    1.21
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.20 2010/06/12 15:21:26 jetmore Exp $ */
  +/* $Cambridge: exim/exim-src/src/buildconfig.c,v 1.21 2010/06/13 08:26:40 pdp Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -34,7 +34,6 @@



   #include <ctype.h>
  -#include <inttypes.h>
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
  @@ -104,10 +103,8 @@
   {
   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;
  @@ -187,14 +184,10 @@
   #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");
  -# endif
   #endif


/* Now search the makefile for certain settings */