From fcf02cbb7588d7a7639221d98b8aaf4c8479d822 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 23 Feb 2013 15:26:26 +0000
Subject: 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.
---
 lib/ftp.h      | 7 -------
 lib/imap.h     | 1 -
 lib/pingpong.h | 7 +++++++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/ftp.h b/lib/ftp.h
index d359f28f3..aae05a772 100644
--- 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 7ab1af7b3..1841ddf61 100644
--- 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 3a87e4041..278f0b619 100644
--- 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.
-- 
cgit v1.2.3