diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-04-14 13:33:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-04-14 13:33:42 +0000 |
| commit | 6e34633d881dba337a34d1bda0688e4c69759ee1 (patch) | |
| tree | b483f71d893ca8e823c19e110627f545c81cd350 | |
| parent | f30a6dc9c6808697e34b4f1076dc74fab7fbae89 (diff) | |
| download | gvfs-6e34633d881dba337a34d1bda0688e4c69759ee1.tar.gz | |
You cannot store pointers in integers. Fixes a crash on 64bit systems.
2008-04-14 Matthias Clasen <mclasen@redhat.com>
* client/gvfsfusedaemon.c: You cannot store pointers in integers.
Fixes a crash on 64bit systems.
svn path=/trunk/; revision=1735
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | client/gvfsfusedaemon.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2008-04-14 Matthias Clasen <mclasen@redhat.com> + * client/gvfsfusedaemon.c: You cannot store pointers in integers. + Fixes a crash on 64bit systems. + +2008-04-14 Matthias Clasen <mclasen@redhat.com> + * common/gmounttracker.c (g_mount_tracker_finalize): Only free lock if it is non-NULL. Pointed out by Denis Leroy. diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c index fbb964fd..367b73dc 100644 --- a/client/gvfsfusedaemon.c +++ b/client/gvfsfusedaemon.c @@ -55,8 +55,8 @@ #define DEBUG_ENABLED 0 -#define GET_FILE_HANDLE(fi) (GUINT_TO_POINTER ((guint) (fi)->fh)) -#define SET_FILE_HANDLE(fi, fh) ((fi)->fh = (guint64) GPOINTER_TO_UINT (fh)) +#define GET_FILE_HANDLE(fi) ((gpointer) (fi)->fh) +#define SET_FILE_HANDLE(fi, fh) ((fi)->fh = (guint64) (fh)) typedef struct { time_t creation_time; |