From b87a6e0eedc31fdaa0d468349769b265db904aa7 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Wed, 23 May 2012 23:27:44 -0400 Subject: [PATCH] Define _ISOC99_SOURCE in exim.h Done before os.h is pulled in so an OS can override it. --- doc/doc-txt/ChangeLog | 5 +++++ src/OS/os.h-Linux | 6 +++--- src/src/exim.h | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8c7dc7230..ef3236a62 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -149,6 +149,11 @@ PP/34 Validate tls_require_ciphers on startup, since debugging an invalid PP/35 Pull in on Linux, for some portability edge-cases of 64-bit ${eval} (JH/03). +PP/36 Define _ISOC99_SOURCE in exim.h; it's needed for some releases of + GNU libc to support some of the 64-bit stuff, should not lead to + conflicts. Defined before os.h is pulled in, so if a given platform + needs to override this, it can. + Exim version 4.77 ----------------- diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux index 5186ec89d..fe4eaa6c7 100644 --- a/src/OS/os.h-Linux +++ b/src/OS/os.h-Linux @@ -1,8 +1,8 @@ /* Exim: OS-specific C header file for Linux */ -/* Some weird variants may require invocation with C99 and features.h -inclusion to build, with the 64-bit arithmetic. Make compiler selection -their problem, but build anyway. */ +/* Some old systems we've received bug-reports for have a which +does not pull in . Best to just pull it in now and have done +with the issue. */ #include diff --git a/src/src/exim.h b/src/src/exim.h index 601dfed74..987aebf83 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -20,6 +20,11 @@ This call dates back at least as far as SUSv2. */ #define HAVE_SRANDOM +/* This is primarily for the Gnu C library; we define it before os.h so that +os.h has a chance to hurriedly undef it, Just In Case. */ + +#define _ISOC99_SOURCE 1 + /* First of all include the os-specific header, which might set things that are needed by any of the other headers, including system headers. */ -- 2.30.2