From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 11 May 2009 12:13:41 +0000 (+0000)
Subject: moved variables more locally to get rid of one set of #ifdefs
X-Git-Tag: curl-7_19_5~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcdbba05d39262cfd0fa5c9d3081bb595457edb9;p=curl

moved variables more locally to get rid of one set of #ifdefs
---

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 */