From de5ba17561e686e5a05c9cc88288c82b563987de Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Wed, 2 Mar 2016 08:12:49 +0100 Subject: [PATCH] Remove confusing #ifndef environ --- src/src/environment.c | 2 -- src/src/readconf.c | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/src/environment.c b/src/src/environment.c index c41d19eba..8542dc0d2 100644 --- a/src/src/environment.c +++ b/src/src/environment.c @@ -9,9 +9,7 @@ #include "exim.h" -#ifndef environ extern char **environ; -#endif /* The cleanup_environment() function is used during the startup phase of the Exim process, right after reading the configurations main diff --git a/src/src/readconf.c b/src/src/readconf.c index 8844ca73a..ead74c1d0 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -11,16 +11,12 @@ implementation of the conditional .ifdef etc. */ #include "exim.h" +extern char **environ; + static void fn_smtp_receive_timeout(const uschar * name, const uschar * str); static void save_config_line(const uschar* line); static void save_config_position(const uschar *file, int line); static void print_config(BOOL admin); -/* glibc seems to define environ as a macro, we can use this to check -it's existence. And, if we declare environ a 2nd time, it shouldn't -harm */ -#ifndef environ -extern char **environ; -#endif #define CSTATE_STACK_SIZE 10 -- 2.25.1