From: Phil Pennock Date: Thu, 24 May 2012 03:43:20 +0000 (-0400) Subject: _ISOC99_SOURCE -> _GNU_SOURCE X-Git-Tag: exim-4_80_RC5^0 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=57eb9e91fe084ad434fcc286f0135e89b658c213;p=exim.git _ISOC99_SOURCE -> _GNU_SOURCE _ISOC99_SOURCE broke build on Linux (Ubuntu 11.10) because it broke , , etc. Their u_char and u_int usage relies upon BSD source being enabled too. So use _GNU_SOURCE. --- diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index ef3236a62..b7a6a00e4 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -149,7 +149,7 @@ 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 +PP/36 Define _GNU_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. diff --git a/src/src/exim.h b/src/src/exim.h index 987aebf83..c18c9aef3 100644 --- a/src/src/exim.h +++ b/src/src/exim.h @@ -21,9 +21,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. */ +os.h has a chance to hurriedly undef it, Just In Case. We need C99 for some +64-bit math support, and defining _ISOC99_SOURCE breaks and friends. +*/ -#define _ISOC99_SOURCE 1 +#define _GNU_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. */