summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftpfs/conn.c7
-rw-r--r--ftpfs/ftpfs.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/ftpfs/conn.c b/ftpfs/conn.c
index 930e2eb7..9be7dd28 100644
--- a/ftpfs/conn.c
+++ b/ftpfs/conn.c
@@ -1,6 +1,6 @@
/* Ftp connection management
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997,2002 Free Software Foundation, Inc.
Written by Miles Bader <miles@gnu.ai.mit.edu>
This file is part of the GNU Hurd.
@@ -19,11 +19,12 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
#include <assert.h>
+#include <stdint.h>
#include "ftpfs.h"
/* A particular connection. */
-struct ftpfs_conn
+struct ftpfs_conn
{
struct ftp_conn *conn;
struct ftpfs_conn *next;
@@ -69,7 +70,7 @@ ftpfs_get_ftp_conn (struct ftpfs *fs, struct ftp_conn **conn)
}
/* For debugging purposes, give each connection a unique integer id. */
- fsc->conn->hook = (void *)conn_id++;
+ fsc->conn->hook = (void *)(uintptr_t)conn_id++;
}
spin_lock (&fs->conn_lock);
diff --git a/ftpfs/ftpfs.c b/ftpfs/ftpfs.c
index 86fea34c..9ff8ef46 100644
--- a/ftpfs/ftpfs.c
+++ b/ftpfs/ftpfs.c
@@ -87,7 +87,8 @@ cntl_debug (struct ftp_conn *conn, int type, const char *txt)
mutex_lock (&debug_lock);
if (debug_stream)
{
- fprintf (debug_stream, "%u.%s%s\n", (unsigned)conn->hook, type_str, txt);
+ fprintf (debug_stream, "%u.%s%s\n",
+ (unsigned)(uintptr_t)conn->hook, type_str, txt);
fflush (debug_stream);
}
mutex_unlock (&debug_lock);