summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2012-05-23 23:43:20 -0400
committerPhil Pennock <pdp@exim.org>2012-05-23 23:43:20 -0400
commit57eb9e91fe084ad434fcc286f0135e89b658c213 (patch)
tree94ec22d9f0429b37cfdeb441205438eb3ba5d806
parentb87a6e0eedc31fdaa0d468349769b265db904aa7 (diff)
_ISOC99_SOURCE -> _GNU_SOURCEexim-4_80_RC5
_ISOC99_SOURCE broke build on Linux (Ubuntu 11.10) because it broke <resolv.h>, <arpa/nameser.h>, etc. Their u_char and u_int usage relies upon BSD source being enabled too. So use _GNU_SOURCE.
-rw-r--r--doc/doc-txt/ChangeLog2
-rw-r--r--src/src/exim.h6
2 files changed, 5 insertions, 3 deletions
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 <features.h> 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 <resolv.h> 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. */