diff lib/protocols.c @ 325:0fcc6468a0af

2003-12-4 Brian Masney <[e-mail]> * lib/cache.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c lib/sslcommon.c src/text/gftp-text.c src/gtk/chmod_dialog.c src/gtk/gftp-gtk.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/transfer.c - when calling gftp_lookup_global_option() or gftp_lookup_request_option(), if the value is an integer, declare the variable type to be intptr_t. This fixes a bug on 64bit platforms (from Gwenole Beauchesne <[e-mail]>) * lib/config_file.c (gftp_config_file_read_float) - 64bit fixup * configure.in - increment version to 2.0.17pre0. Undefine _GNU_SOURCE. Check for stdint.h. * lib/gftp.h - include stdint.h if it is found on the system. * src/gtk/gftp-gtk.c (CreateToolbar) - on startup, have the host edit box grab the keyboard focus

--- a/lib/protocols.c	Fri Dec 05 00:16:33 2003 +0000
+++ b/lib/protocols.c	Fri Dec 05 00:19:48 2003 +0000
@@ -212,6 +212,7 @@
   g_return_val_if_fail (tofile != NULL, GFTP_EFATAL);
 
   gftp_lookup_request_option (toreq, "maxkbs", &maxkbs);
+
   if (maxkbs > 0)
     {
       toreq->logging_function (gftp_logging_misc, toreq,
@@ -2222,7 +2223,7 @@
 ssize_t 
 gftp_fd_read (gftp_request * request, void *ptr, size_t size, int fd)
 {
-  long network_timeout;
+  intptr_t network_timeout;
   struct timeval tv;
   fd_set fset;
   ssize_t ret;
@@ -2292,7 +2293,7 @@
 ssize_t 
 gftp_fd_write (gftp_request * request, const char *ptr, size_t size, int fd)
 {
-  long network_timeout;
+  intptr_t network_timeout;
   struct timeval tv;
   ssize_t w_ret;
   fd_set fset;
@@ -2495,7 +2496,8 @@
 int
 gftp_get_transfer_status (gftp_transfer * tdata, ssize_t num_read)
 {
-  int ret1, ret2, retries, sleep_time;
+  int ret1, ret2;
+  intptr_t retries, sleep_time;
   gftp_file * tempfle;
   struct timeval tv;