From e541e05746f10ca361f3e2ec0b7f33f7febe88ac Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Mon, 1 Aug 2005 20:43:31 +0000
Subject: Define temporary variable with #ifdefs rather than using these inside
 a macro expansion. Based on a patch by Miloslav Trmac.

svn path=/trunk/; revision=4211
---
 fetchmail.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'fetchmail.c')

diff --git a/fetchmail.c b/fetchmail.c
index 0d237213..54ba2a81 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -199,8 +199,7 @@ int main(int argc, char **argv)
 
     if (versioninfo)
     {
-	printf(GT_("This is fetchmail release %s"), VERSION);
-	printf(
+	const char *features = 
 #ifdef POP2_ENABLE
 	"+POP2"
 #endif /* POP2_ENABLE */
@@ -246,7 +245,9 @@ int main(int argc, char **argv)
 #ifdef ENABLE_NLS
 	"+NLS"
 #endif /* ENABLE_NLS */
-	"\n");
+	"\n";
+	printf(GT_("This is fetchmail release %s"), VERSION);
+	fputs(features, stdout);
 	fputs("Fallback MDA: ", stdout);
 #ifdef FALLBACK_MDA
 	fputs(FALLBACK_MDA, stdout);
-- 
cgit v1.2.3