From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 23 Feb 2013 17:09:24 +0000 (+0000)
Subject: pingpong: Renamed curl_ftptransfer to curl_pp_transfer
X-Git-Tag: curl-7_30_0~295
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4afcb778203bf5af15804a1897596c6feb4d3b81;p=thirdparty%2Fcurl.git

pingpong: Renamed curl_ftptransfer to curl_pp_transfer
---

diff --git a/lib/ftp.h b/lib/ftp.h
index aae05a7723..bdd59c93da 100644
--- a/lib/ftp.h
+++ b/lib/ftp.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, 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
@@ -108,7 +108,7 @@ struct FTP {
 
   /* transfer a file/body or not, done as a typedefed enum just to make
      debuggers display the full symbol and not just the numerical value */
-  curl_ftptransfer transfer;
+  curl_pp_transfer transfer;
   curl_off_t downloadsize;
 };
 
diff --git a/lib/imap.h b/lib/imap.h
index 1841ddf611..6fa1ba4f24 100644
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -57,7 +57,7 @@ typedef enum {
    used. */
 struct IMAP {
   curl_off_t *bytecountp;
-  curl_ftptransfer transfer;
+  curl_pp_transfer transfer;
   char *mailbox;          /* Mailbox to select */
 };
 
diff --git a/lib/pingpong.h b/lib/pingpong.h
index 278f0b6195..b925ab98e1 100644
--- a/lib/pingpong.h
+++ b/lib/pingpong.h
@@ -37,7 +37,7 @@ typedef enum {
   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;
+} curl_pp_transfer;
 
 /*
  * 'pingpong' is the generic struct used for protocols doing server<->client
diff --git a/lib/pop3.h b/lib/pop3.h
index cfad93c844..05df8bc6f5 100644
--- a/lib/pop3.h
+++ b/lib/pop3.h
@@ -58,7 +58,7 @@ typedef enum {
    used. */
 struct POP3 {
   curl_off_t *bytecountp;
-  curl_ftptransfer transfer;
+  curl_pp_transfer transfer;
   char *mailbox;          /* Message ID */
   char *custom;           /* Custom Request */
 };