From 2b37288e8dc65ebcb3778596e23f3dc6bf5ef97c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <ossi@users.sf.net>
Date: Sat, 22 Sep 2007 08:45:41 +0000
Subject: [PATCH] don't use #ifdef inside htons() arguments - it can be a
 macro. -REF: <lyy7ezyjah.fsf@gfn.org> CCMAIL: Scott Gifford
 <sgifford@suspectclass.com>

---
 src/drv_imap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/drv_imap.c b/src/drv_imap.c
index f9a858c..d8a1fc9 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -1261,11 +1261,11 @@ imap_open_store( store_conf_t *conf,
 		info( "ok\n" );
 	} else {
 		memset( &addr, 0, sizeof(addr) );
-		addr.sin_port = htons( srvc->port ? srvc->port :
+		addr.sin_port = srvc->port ? htons( srvc->port ) :
 #ifdef HAVE_LIBSSL
-		                       srvc->use_imaps ? 993 :
+		                srvc->use_imaps ? htons( 993 ) :
 #endif
-		                       143 );
+		                htons( 143 );
 		addr.sin_family = AF_INET;
 
 		infon( "Resolving %s... ", srvc->host );