[Rhythmbox-devel] Patches for amd64 build
- From: Eskil Heyn Olsen <eskil eskil org>
- To: rhythmbox <rhythmbox-devel gnome org>
- Subject: [Rhythmbox-devel] Patches for amd64 build
- Date: Thu, 08 Jul 2004 22:41:39 -0700
'evening...
I've made some patches to rhythmbox 0.8.99 from cvs.gnome.org to make it
compile on debian-amd64.
The patches are two printf %llu arguments and two gpointer casts changed
to GINT_TO_POINTER.
eskil
---
? metadata/Makefile
? metadata/Makefile.in
? player/Makefile
? player/Makefile.in
Index: rhythmdb/rhythmdb-tree.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmdb/rhythmdb-tree.c,v
retrieving revision 1.51
diff -d -u -r1.51 rhythmdb-tree.c
--- rhythmdb/rhythmdb-tree.c 22 Jun 2004 19:21:40 -0000 1.51
+++ rhythmdb/rhythmdb-tree.c 9 Jul 2004 05:23:03 -0000
@@ -762,7 +762,13 @@
RHYTHMDB_FWRITE_SMALLTYPE (ctx->handle, "%ld", long);
break;
case G_TYPE_UINT64:
+#if __WORDSIZE==32
RHYTHMDB_FWRITE_SMALLTYPE (ctx->handle, "%llu", uint64);
+#elif __WORDSIZE==64
+ RHYTHMDB_FWRITE_SMALLTYPE (ctx->handle, "%lu", uint64);
+#else
+#error Unsupported wordsize
+#endif
break;
case G_TYPE_FLOAT:
RHYTHMDB_FWRITE_SMALLTYPE (ctx->handle, "%f", float);
Index: rhythmdb/rhythmdb.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/rhythmdb/rhythmdb.c,v
retrieving revision 1.78
diff -d -u -r1.78 rhythmdb.c
--- rhythmdb/rhythmdb.c 10 May 2004 14:45:42 -0000 1.78
+++ rhythmdb/rhythmdb.c 9 Jul 2004 05:23:05 -0000
@@ -1687,7 +1687,13 @@
strval = g_strdup_printf ("%ld", g_value_get_long (val));
break;
case G_TYPE_UINT64:
+#if __WORDSIZE==32
strval = g_strdup_printf ("%llu", g_value_get_uint64 (val));
+#elif __WORDSIZE==64
+ strval = g_strdup_printf ("%lu", g_value_get_uint64 (val));
+#else
+#error Unsupported wordsize
+#endif
break;
case G_TYPE_FLOAT:
strval = g_strdup_printf ("%f", g_value_get_float (val));
Index: shell/rb-shell.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/shell/rb-shell.c,v
retrieving revision 1.285
diff -d -u -r1.285 rb-shell.c
--- shell/rb-shell.c 22 Jun 2004 19:21:49 -0000 1.285
+++ shell/rb-shell.c 9 Jul 2004 05:23:08 -0000
@@ -1683,7 +1683,7 @@
static RBSource *
rb_shell_get_source_by_entry_type (RBShell *shell, RhythmDBEntryType type)
{
- return g_hash_table_lookup (shell->priv->sources_hash, (gpointer)type);
+ return g_hash_table_lookup (shell->priv->sources_hash, GINT_TO_POINTER (type));
}
void
Index: sources/itunesdb.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/itunesdb.c,v
retrieving revision 1.5
diff -d -u -r1.5 itunesdb.c
--- sources/itunesdb.c 23 Apr 2004 03:25:16 -0000 1.5
+++ sources/itunesdb.c 9 Jul 2004 05:23:10 -0000
@@ -491,7 +491,7 @@
if (cmp_n_bytes (data, "mhip", 4) == TRUE)
{
ref = get4int(parser->itunes, parser->seek+24);
- plitem->song_ids = g_list_append (plitem->song_ids, (gpointer)ref);
+ plitem->song_ids = g_list_append (plitem->song_ids, GINT_TO_POINTER (ref));
++n;
}
parser->seek += get4int (parser->itunes, parser->seek+8);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]