uClibc does not contain gnu/libc-version.h

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 0baa1dc67c86629460efae0f3c57f84d2abd6ef2..5b5dcbd7f7c37bc77cb4b5b2228301c98891c2c9 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -30,6 +30,10 @@ JH/04 Shorten the log line for daemon startup by collapsing adjacent sets of
       identical IP addresses on different listening ports.  Will also affect
       "exiwhat" output.
 
       identical IP addresses on different listening ports.  Will also affect
       "exiwhat" output.
 

+PP/02 Bug 2070: uClibc defines __GLIBC__ without providing glibc headers;
+      add noisy ifdef guards to special-case this sillyness.
+      Patch from Bernd Kuhls.
+

 
 Exim version 4.89
 -----------------
 
 Exim version 4.89
 -----------------

diff --git a/src/src/exim.c b/src/src/exim.c
index ee7bfcd22fa6a0e1de4c1a4aaa1721120eb172f3..fd08cc780d7c233fa103ca03b2d244f675bafb56 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -12,7 +12,7 @@ Also a few functions that don't naturally fit elsewhere. */
 
 #include "exim.h"
 
 
 #include "exim.h"
 

-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)

 # include <gnu/libc-version.h>
 #endif
 
 # include <gnu/libc-version.h>
 #endif
 


@@ -1044,7 +1044,7 @@ DEBUG(D_any) do {
   fprintf(f, "Compiler: <unknown>\n");
 #endif
 
   fprintf(f, "Compiler: <unknown>\n");
 #endif
 

-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)

   fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
                __GLIBC__, __GLIBC_MINOR__);
   if (__GLIBC_PREREQ(2, 1))
   fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
                __GLIBC__, __GLIBC_MINOR__);
   if (__GLIBC_PREREQ(2, 1))