[svn] Applied Tim Mooney's patch that fixes a build problem under Tru64.

Published in
<Pine.OSF.4.33.0102072244450.2714-100000@dogbert.cc.ndsu.NoDak.edu>.

diff --git a/src/ChangeLog b/src/ChangeLog
index d505b4c5bafd8e10bb072d599d84635f124b7447..65ce1779e500dcde394130ae162a87ba1de96e4c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-10  Tim Mooney  <mooney@dogbert.cc.ndsu.NoDak.edu>
+
+       * ftp.h: Rename enums `command' to `wget_ftp_command' and
+       `fstatus' to `wget_ftp_status' because old names clash with Tru64
+       net/if.h.
+
 2001-02-08  Christian Fraenkel <christian.fraenkel@gmx.net>
 
         * gen_sslfunc.c: verify_callback is now static

diff --git a/src/ftp.h b/src/ftp.h
index 0fa0a164c15ea5ea725169f6f3fb60036a8aacfd..06a53318fde5aa6bc00be4863898fab974b01e89 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -74,7 +74,7 @@ struct fileinfo
 };
 
 /* Commands for FTP functions.  */
-enum command
+enum wget_ftp_command
 {
   DO_LOGIN      = 0x0001,      /* Connect and login to the server.  */
   DO_CWD        = 0x0002,      /* Change current directory.  */
@@ -83,7 +83,7 @@ enum command
   LEAVE_PENDING = 0x0010       /* Do not close the socket.  */
 };
 
-enum fstatus
+enum wget_ftp_fstatus
 {
   NOTHING       = 0x0000,      /* Nothing done yet.  */
   ON_YOUR_OWN   = 0x0001,      /* The ftp_loop_internal sets the