On Thu, 2004-07-08 at 22:41 -0700, Eskil Heyn Olsen wrote: > 'evening... > > I've made some patches to rhythmbox 0.8.99 from cvs.gnome.org to make it > compile on debian-amd64. First: thanks for this patch! > +#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 This is actually what G_GUINT64_FORMAT is for. I changed it to use that. > +#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 Ditto. > --- 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)); > } Looks good. > --- 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); This one should actually be GUINT_TO_POINTER since ref is unsigned. I applied your patch with these changes, thanks! BTW, the mailing list is usually ok, but patches like this are best in Bugzilla so they don't get lost. * committed rhythmbox-devel gnome org--2004/rhythmbox--main--0.9--patch-82
Attachment:
signature.asc
Description: This is a digitally signed message part