diff options
| author | Mark Salisbury <mark.salisbury@hp.com> | 2012-06-18 13:06:02 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-06-18 18:51:30 +0200 |
| commit | 05f6f2497a9cd238e3314ab60ebbd8d816780a73 (patch) | |
| tree | 5900a5bff2ecaaa12fa10030970db26a0156b972 | |
| parent | d56e8bcc8aeed07d73a3047c5a5be8bb9df53e0b (diff) | |
ftplistparser.c: do not compile if FTP protocol is not enabled
| -rw-r--r-- | lib/ftplistparser.c | 12 | ||||
| -rw-r--r-- | lib/ftplistparser.h | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index bbf6e9ef9..49ee4b6a6 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -37,16 +37,18 @@ #include "setup.h" -#include "ftplistparser.h" -#include "curl_fnmatch.h" +#ifndef CURL_DISABLE_FTP + +#include <curl/curl.h> #include "urldata.h" -#include "ftp.h" #include "fileinfo.h" #include "llist.h" #include "strtoofft.h" #include "rawstr.h" #include "ftp.h" +#include "ftplistparser.h" +#include "curl_fnmatch.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -1044,3 +1046,5 @@ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, return bufflen; } + +#endif /* CURL_DISABLE_FTP */ diff --git a/lib/ftplistparser.h b/lib/ftplistparser.h index 67a06c296..8499ccda4 100644 --- a/lib/ftplistparser.h +++ b/lib/ftplistparser.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -21,8 +21,9 @@ * KIND, either express or implied. * ***************************************************************************/ +#include "setup.h" -#include <curl/curl.h> +#ifndef CURL_DISABLE_FTP /* WRITEFUNCTION callback for parsing LIST responses */ size_t Curl_ftp_parselist(char *buffer, size_t size, size_t nmemb, @@ -36,4 +37,5 @@ struct ftp_parselist_data *Curl_ftp_parselist_data_alloc(void); void Curl_ftp_parselist_data_free(struct ftp_parselist_data **pl_data); +#endif /* CURL_DISABLE_FTP */ #endif /* HEADER_CURL_FTPLISTPARSER_H */ |