From bcdbba05d39262cfd0fa5c9d3081bb595457edb9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 11 May 2009 12:13:41 +0000 Subject: [PATCH] moved variables more locally to get rid of one set of #ifdefs --- lib/ftp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/ftp.c b/lib/ftp.c index bacd94f8b..c801a8fc0 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -3040,11 +3040,6 @@ static CURLcode ftp_connect(struct connectdata *conn, bool *done) /* see description above */ { CURLcode result; -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) - /* for FTP over HTTP proxy */ - struct HTTP http_proxy; - struct FTP *ftp_save; -#endif /* CURL_DISABLE_HTTP */ struct ftp_conn *ftpc = &conn->proto.ftpc; struct SessionHandle *data=conn->data; @@ -3065,6 +3060,10 @@ static CURLcode ftp_connect(struct connectdata *conn, #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { + /* for FTP over HTTP proxy */ + struct HTTP http_proxy; + struct FTP *ftp_save; + /* BLOCKING */ /* We want "seamless" FTP operations through HTTP proxy tunnel */