From fdc20de3650934819a33723fb297584acdf2483b Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Sat, 10 Feb 2001 14:37:12 -0800
Subject: [PATCH] [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>.
---
src/ChangeLog | 6 ++++++
src/ftp.h | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index d505b4c5..65ce1779 100644
--- 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 0fa0a164..06a53318 100644
--- 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