make Curl_handler_*_proxy definition static

5 files changed, 14 insertions, 22 deletions

diff --git a/lib/ftp.c b/lib/ftp.c
index 45503ccf5..00b1a8ef2 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -201,7 +201,7 @@ const struct Curl_handler Curl_handler_ftps = {
  * HTTP-proxyed FTP protocol handler.
  */
 
-const struct Curl_handler Curl_handler_ftp_proxy = {
+static const struct Curl_handler Curl_handler_ftp_proxy = {
   "FTP",                                /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
@@ -224,7 +224,7 @@ const struct Curl_handler Curl_handler_ftp_proxy = {
  * HTTP-proxyed FTPS protocol handler.
  */
 
-const struct Curl_handler Curl_handler_ftps_proxy = {
+static const struct Curl_handler Curl_handler_ftps_proxy = {
   "FTPS",                               /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
diff --git a/lib/ftp.h b/lib/ftp.h
index 1ff2d92f4..afc5f69c5 100644
--- a/lib/ftp.h
+++ b/lib/ftp.h
@@ -1,5 +1,5 @@
-#ifndef __FTP_H
-#define __FTP_H
+#ifndef HEADER_CURL_FTP_H
+#define HEADER_CURL_FTP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -32,14 +32,6 @@ extern const struct Curl_handler Curl_handler_ftp;
 extern const struct Curl_handler Curl_handler_ftps;
 #endif
 
-#ifndef CURL_DISABLE_HTTP
-extern const struct Curl_handler Curl_handler_ftp_proxy;
-
-# ifdef USE_SSL
-extern const struct Curl_handler Curl_handler_ftps_proxy;
-# endif
-#endif
-
 CURLcode Curl_ftpsendf(struct connectdata *, const char *fmt, ...);
 CURLcode Curl_GetFTPResponse(ssize_t *nread, struct connectdata *conn,
                              int *ftpcode);
@@ -146,4 +138,4 @@ struct ftp_conn {
   char * server_os;     /* The target server operating system. */
 };
 
-#endif /* __FTP_H */
+#endif /* HEADER_CURL_FTP_H */
diff --git a/lib/imap.c b/lib/imap.c
index fab6c4dde..2920a0177 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -160,7 +160,7 @@ const struct Curl_handler Curl_handler_imaps = {
  * HTTP-proxyed IMAP protocol handler.
  */
 
-const struct Curl_handler Curl_handler_imap_proxy = {
+static const struct Curl_handler Curl_handler_imap_proxy = {
   "IMAP",                               /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
@@ -183,7 +183,7 @@ const struct Curl_handler Curl_handler_imap_proxy = {
  * HTTP-proxyed IMAPS protocol handler.
  */
 
-const struct Curl_handler Curl_handler_imaps_proxy = {
+static const struct Curl_handler Curl_handler_imaps_proxy = {
   "IMAPS",                              /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
diff --git a/lib/pop3.c b/lib/pop3.c
index 24354504f..bb3781ef3 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -161,7 +161,7 @@ const struct Curl_handler Curl_handler_pop3s = {
  * HTTP-proxyed POP3 protocol handler.
  */
 
-const struct Curl_handler Curl_handler_pop3_proxy = {
+static const struct Curl_handler Curl_handler_pop3_proxy = {
   "POP3",                               /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
@@ -184,7 +184,7 @@ const struct Curl_handler Curl_handler_pop3_proxy = {
  * HTTP-proxyed POP3S protocol handler.
  */
 
-const struct Curl_handler Curl_handler_pop3s_proxy = {
+static const struct Curl_handler Curl_handler_pop3s_proxy = {
   "POP3S",                              /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
diff --git a/lib/smtp.c b/lib/smtp.c
index 0f34c4f9e..1e5304723 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2010, 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
@@ -159,7 +159,7 @@ const struct Curl_handler Curl_handler_smtps = {
  * HTTP-proxyed SMTP protocol handler.
  */
 
-const struct Curl_handler Curl_handler_smtp_proxy = {
+static const struct Curl_handler Curl_handler_smtp_proxy = {
   "SMTP",                               /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
@@ -182,7 +182,7 @@ const struct Curl_handler Curl_handler_smtp_proxy = {
  * HTTP-proxyed SMTPS protocol handler.
  */
 
-const struct Curl_handler Curl_handler_smtps_proxy = {
+static const struct Curl_handler Curl_handler_smtps_proxy = {
   "SMTPS",                              /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */