52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
Extract from complete patch from
|
|
https://git.exim.org/exim.git/patch/26dd3aa007b3b77969610c031f59388e0953bd00
|
|
to only take the buildconfig.c change because the git directory
|
|
structure is different from a release tarball causing this patch to fail
|
|
otherwise.
|
|
|
|
From 26dd3aa007b3b77969610c031f59388e0953bd00 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Harris <jgh146exb@wizmail.org>
|
|
Date: Fri, 7 Jun 2019 11:54:10 +0100
|
|
Subject: [PATCH] Fix detection of 32b platform at build time. Bug 2405
|
|
|
|
---
|
|
src/src/buildconfig.c | 12 +++++---
|
|
test/scripts/0000-Basic/0002 | 72 +++++++++++++++++++++++---------------------
|
|
test/stdout/0002 | 72 +++++++++++++++++++++++---------------------
|
|
3 files changed, 83 insertions(+), 73 deletions(-)
|
|
|
|
diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
|
|
index 71cf97b..a680b34 100644
|
|
--- a/src/src/buildconfig.c
|
|
+++ b/src/src/buildconfig.c
|
|
@@ -111,6 +111,7 @@ unsigned long test_ulong_t = 0L;
|
|
unsigned int test_uint_t = 0;
|
|
#endif
|
|
long test_long_t = 0;
|
|
+long long test_longlong_t = 0;
|
|
int test_int_t = 0;
|
|
FILE *base;
|
|
FILE *new;
|
|
@@ -155,15 +156,16 @@ This assumption is known to be OK for the common operating systems. */
|
|
|
|
fprintf(new, "#ifndef OFF_T_FMT\n");
|
|
if (sizeof(test_off_t) > sizeof(test_long_t))
|
|
- {
|
|
fprintf(new, "# define OFF_T_FMT \"%%lld\"\n");
|
|
- fprintf(new, "# define LONGLONG_T long long int\n");
|
|
- }
|
|
else
|
|
- {
|
|
fprintf(new, "# define OFF_T_FMT \"%%ld\"\n");
|
|
+fprintf(new, "#endif\n\n");
|
|
+
|
|
+fprintf(new, "#ifndef LONGLONG_T\n");
|
|
+if (sizeof(test_longlong_t) > sizeof(test_long_t))
|
|
+ fprintf(new, "# define LONGLONG_T long long int\n");
|
|
+else
|
|
fprintf(new, "# define LONGLONG_T long int\n");
|
|
- }
|
|
fprintf(new, "#endif\n\n");
|
|
|
|
/* Now do the same thing for time_t variables. If the length is greater than
|