# HG changeset patch
# User masneyb
# Date 1082081482 0
# Node ID 39d9cf1bf0dfcae375b9e9441621328118b573b1
# Parent  d6fb15d110c9842409b4b0653d195b5b5a2d411f
2004-4-14 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c lib/rfc959.c src/gtk/transfer.c - AMD64 fixes

diff -r d6fb15d110c9 -r 39d9cf1bf0df ChangeLog
--- a/ChangeLog	Thu Apr 15 14:23:21 2004 +0000
+++ b/ChangeLog	Fri Apr 16 02:11:22 2004 +0000
@@ -1,3 +1,6 @@
+2004-4-14 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c lib/rfc959.c src/gtk/transfer.c - AMD64 fixes
+
 2004-4-14 Brian Masney <masneyb@gftp.org>
 	* lib/sshv2.c lib/gftp.h src/text/textui.c src/gtk/gtkui.c - when
 	connecting with the SSH protocol, if the user is asked a question,
@@ -2445,7 +2448,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.259 2004/04/15 00:59:22 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.260 2004/04/16 02:11:22 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r d6fb15d110c9 -r 39d9cf1bf0df lib/protocols.c
--- a/lib/protocols.c	Thu Apr 15 14:23:21 2004 +0000
+++ b/lib/protocols.c	Fri Apr 16 02:11:22 2004 +0000
@@ -1948,8 +1948,9 @@
   int port, sock;
 #if defined (HAVE_GETADDRINFO) && defined (HAVE_GAI_STRERROR)
   struct addrinfo hints, *res;
-  int errnum, enable_ipv6;
+  intptr_t enable_ipv6;
   char serv[8];
+  int errnum;
 
   if ((request->use_proxy = gftp_need_proxy (request, service,
                                              proxy_hostname, proxy_port)) < 0)
diff -r d6fb15d110c9 -r 39d9cf1bf0df lib/rfc959.c
--- a/lib/rfc959.c	Thu Apr 15 14:23:21 2004 +0000
+++ b/lib/rfc959.c	Fri Apr 16 02:11:22 2004 +0000
@@ -770,7 +770,7 @@
 {
   char *pos, resp, buf[64], *command;
   struct sockaddr_in6 data_addr;
-  int passive_transfer;
+  intptr_t passive_transfer;
   socklen_t data_addr_len;
   rfc959_parms * parms;
   unsigned int port;
diff -r d6fb15d110c9 -r 39d9cf1bf0df src/gtk/transfer.c
--- a/src/gtk/transfer.c	Thu Apr 15 14:23:21 2004 +0000
+++ b/src/gtk/transfer.c	Fri Apr 16 02:11:22 2004 +0000
@@ -646,8 +646,9 @@
 update_file_status (gftp_transfer * tdata)
 {
   char totstr[100], dlstr[100], winstr[150], gotstr[50], ofstr[50];
-  int hours, mins, secs, pcent, st, show_trans_in_title;
   unsigned long remaining_secs, lkbs;
+  int hours, mins, secs, pcent, st;
+  intptr_t show_trans_in_title;
   gftp_file * tempfle;
   struct timeval tv;