git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
157a788
)
Add glibc version to libraries report
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 21 May 2016 14:55:06 +0000
(15:55 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 21 May 2016 14:55:06 +0000
(15:55 +0100)
src/src/exim.c
patch
|
blob
|
history
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 4ea42fdc249938c20b745b2f85bfcc45f1f5b769..d462c3e84eb3d0a90900151438b6d7af98c17651 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-12,6
+12,10
@@
Also a few functions that don't naturally fit elsewhere. */
#include "exim.h"
#include "exim.h"
+#ifdef __GLIBC__
+# include <gnu/libc-version.h>
+#endif
+
#ifdef USE_GNUTLS
# include <gnutls/gnutls.h>
# if GNUTLS_VERSION_NUMBER < 0x030103 && !defined(DISABLE_OCSP)
#ifdef USE_GNUTLS
# include <gnutls/gnutls.h>
# if GNUTLS_VERSION_NUMBER < 0x030103 && !defined(DISABLE_OCSP)
@@
-1025,6
+1029,14
@@
DEBUG(D_any) do {
fprintf(f, "Compiler: <unknown>\n");
#endif
fprintf(f, "Compiler: <unknown>\n");
#endif
+#ifdef __GLIBC__
+ fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
+ __GLIBC__, __GLIBC_MINOR__);
+ if (__GLIBC_PREREQ(2, 1))
+ fprintf(f, " Runtime: %s\n",
+ gnu_get_libc_version());
+#endif
+
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
#ifdef SUPPORT_TLS
tls_version_report(f);
#endif
@@
-1040,7
+1052,7
@@
DEBUG(D_any) do {
characters; unless it's an ancient version of PCRE in which case it
is not defined. */
#ifndef PCRE_PRERELEASE
characters; unless it's an ancient version of PCRE in which case it
is not defined. */
#ifndef PCRE_PRERELEASE
-#define PCRE_PRERELEASE
+#
define PCRE_PRERELEASE
#endif
#define QUOTE(X) #X
#define EXPAND_AND_QUOTE(X) QUOTE(X)
#endif
#define QUOTE(X) #X
#define EXPAND_AND_QUOTE(X) QUOTE(X)