diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-04-14 13:35:53 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-04-14 13:35:53 +0000 |
| commit | 7baffe596e78fe70414442b011e0750b91cef962 (patch) | |
| tree | 124ddbb91e38097eb698f55d969fe02f42f2c6f6 | |
| parent | 2fcf126f0cb973a8d73de6d819a60e9a29dbf756 (diff) | |
| download | gvfs-7baffe596e78fe70414442b011e0750b91cef962.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=/branches/gnome-2-22/; revision=1736
| -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; |