pingpong: Moved curl_ftptransfer definition to pingpong.h

Moved the ftp transfer structure into pingpong.h so other protocols that
require it don't have to include ftp.h.

diff --git a/lib/ftp.h b/lib/ftp.h
index d359f28f35a8669537c13e7190470dbd8d2334d2..aae05a77239f45237e0ec7fc8d2295021139bd9b 100644 (file)
--- a/lib/ftp.h
+++ b/lib/ftp.h
@@ -97,13 +97,6 @@ typedef enum {
                             file */
 } curl_ftpfile;
 
-typedef enum {
-  FTPTRANSFER_BODY, /* yes do transfer a body */
-  FTPTRANSFER_INFO, /* do still go through to get info/headers */
-  FTPTRANSFER_NONE, /* don't get anything and don't get info */
-  FTPTRANSFER_LAST  /* end of list marker, never used */
-} curl_ftptransfer;
-
 /* This FTP struct is used in the SessionHandle. All FTP data that is
    connection-oriented must be in FTP_conn to properly deal with the fact that
    perhaps the SessionHandle is changed between the times the connection is

diff --git a/lib/imap.h b/lib/imap.h
index 7ab1af7b31366ac8ddc3f625f3f91487778b4b47..1841ddf6116ea5e0e78e2dcbe2319a697962d864 100644 (file)
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -23,7 +23,6 @@
  ***************************************************************************/
 
 #include "pingpong.h"
-#include "ftp.h"
 
 /****************************************************************************
  * IMAP unique setup

diff --git a/lib/pingpong.h b/lib/pingpong.h
index 3a87e404188569812d9d88f3020c4099359c981e..278f0b6195d950281b8346b586ad7f82d0625832 100644 (file)
--- a/lib/pingpong.h
+++ b/lib/pingpong.h
@@ -32,6 +32,13 @@
 /* forward-declaration, this is defined in urldata.h */
 struct connectdata;
 
+typedef enum {
+  FTPTRANSFER_BODY, /* yes do transfer a body */
+  FTPTRANSFER_INFO, /* do still go through to get info/headers */
+  FTPTRANSFER_NONE, /* don't get anything and don't get info */
+  FTPTRANSFER_LAST  /* end of list marker, never used */
+} curl_ftptransfer;
+
 /*
  * 'pingpong' is the generic struct used for protocols doing server<->client
  * conversations in a back-and-forth style such as FTP, IMAP, POP3, SMTP etc.