head 1.3; access; symbols pkgsrc-2020Q1:1.2.0.48 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.70 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.66 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.64 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.62 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.60 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.58 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.56 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.54 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.52 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.50 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.46 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.44 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.42 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.40 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.38 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.36 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.34 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.32 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.30 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.28 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.26 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.24 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.22 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.20 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.18 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.16 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.12 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2020.05.15.12.18.03; author nia; state dead; branches; next 1.2; commitid p3lSejDZu12GJk8C; 1.2 date 2011.12.14.02.54.27; author sbd; state Exp; branches; next 1.1; 1.1 date 2011.10.02.01.20.55; author dholland; state Exp; branches; next ; desc @@ 1.3 log @sysutils: Remove gnometoaster This has been "early alpha" since 2005 and is now unique to pkgsrc @ text @$NetBSD: patch-cddb_c,v 1.2 2011/12/14 02:54:27 sbd Exp $ - fix include silliness - fix LP64 problems --- cddb.c.orig 2001-10-28 11:41:51.000000000 +0000 +++ cddb.c @@@@ -45,11 +45,8 @@@@ #include #include #include -#ifndef __FreeBSD__ # include -#else # include -#endif #include #include #include @@@@ -431,7 +428,7 @@@@ GList *cddb_serverrequest(gchar *server, if (result==210) { /* the first line is the corresponding cddb_key */ - entry=g_list_append(entry,(gpointer)es->cddb_key); + entry=g_list_append(entry,(gpointer)(intptr_t)es->cddb_key); /* store a response line */ while (cddb_poll(cddb_sfd,resstr)) entry=g_list_append(entry,g_strdup(resstr)); @@@@ -458,7 +455,7 @@@@ GList *cddb_cachelookup(cddb_essentials while ((current!=NULL)&&(result==NULL)) { GList *entry=(GList*)current->data; - if ((int)entry->data==es->cddb_key) + if ((int)(intptr_t)entry->data==es->cddb_key) result=entry; current=current->next; }; @@@@ -754,7 +751,7 @@@@ void *cddb_commthread(void *s) * cancelled. * data can point to additional informations passed to the callback * but may otherwise safely be set to NULL */ -int cddb_lookup(cddb_essentials *es, +cddb_infostruct *cddb_lookup(cddb_essentials *es, int tracknum, cddb_datahandler callback, gpointer data) @@@@ -786,12 +783,12 @@@@ int cddb_lookup(cddb_essentials *es, pthread_mutex_unlock(&cddb_sem); }; - return (int)info; + return info; }; /* kill a cddb lookup job. this is done e.g. in tracks.c when the last reference * to a track has been cleared and the track is about to be deleted */ -void cddb_killjob(int jobid) +void cddb_killjob(cddb_infostruct *jobid) { if (jobid) { @ 1.2 log @Regenerate diffs for GNU patch. @ text @d1 1 a1 1 $NetBSD: patch-cddb_c,v 1.1 2011/10/02 01:20:55 dholland Exp $ @ 1.1 log @Fix trivial broken build. Then, fix extensive but straightforward LP64 issues reported by gcc. PKGREVISION -> 6. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2006/03/06 22:16:53 joerg Exp $ d8 1 a8 1 @@@@ -45,10 +45,7 @@@@ d19 2 a20 1 @@@@ -431,7 +431,7 @@@@ GList *cddb_serverrequest(gchar *server, d29 1 a29 1 @@@@ -458,7 +458,7 @@@@ GList *cddb_cachelookup(cddb_essentials d38 1 a38 1 @@@@ -754,7 +754,7 @@@@ void *cddb_commthread(void *s) d47 1 a47 1 @@@@ -786,12 +786,12 @@@@ int cddb_lookup(cddb_essentials *es, @