From: Jaroslav Kysela Date: Tue, 9 May 2017 12:28:35 +0000 (+0200) Subject: gcc fixes for the last commit X-Git-Tag: v4.2.2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8717b41d77cee7e02c1da41036bb0df26d69a527;p=thirdparty%2Ftvheadend.git gcc fixes for the last commit --- diff --git a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c index af7f50926..754f1bfde 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c @@ -439,14 +439,17 @@ linuxdvb_lnb_create0 lsc2 = malloc(sizeof(linuxdvb_lnb_conf_t)); *lsc2 = *lsc; - return linuxdvb_diseqc_create0(lsc2, NULL, &linuxdvb_lnb_class, conf, lsc->ld_type, ls); + return (linuxdvb_lnb_t *) + linuxdvb_diseqc_create0((linuxdvb_diseqc_t *)lsc2, + NULL, &linuxdvb_lnb_class, + conf, lsc->ld_type, ls); } void -linuxdvb_lnb_destroy ( linuxdvb_diseqc_t *ld ) +linuxdvb_lnb_destroy ( linuxdvb_lnb_t *lnb ) { - linuxdvb_diseqc_destroy(ld); - free(ld); + linuxdvb_diseqc_destroy((linuxdvb_diseqc_t *)lnb); + free(lnb); } /****************************************************************************** diff --git a/src/input/mpegts/linuxdvb/linuxdvb_private.h b/src/input/mpegts/linuxdvb/linuxdvb_private.h index 8b96b9951..daeb1e258 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_private.h +++ b/src/input/mpegts/linuxdvb/linuxdvb_private.h @@ -461,7 +461,7 @@ linuxdvb_diseqc_t *linuxdvb_rotor_create0 linuxdvb_diseqc_t *linuxdvb_en50494_create0 ( const char *name, htsmsg_t *conf, linuxdvb_satconf_ele_t *ls, int port ); -void linuxdvb_lnb_destroy ( linuxdvb_diseqc_t *ld ); +void linuxdvb_lnb_destroy ( linuxdvb_lnb_t *lnb ); void linuxdvb_switch_destroy ( linuxdvb_diseqc_t *ld ); void linuxdvb_rotor_destroy ( linuxdvb_diseqc_t *ld ); void linuxdvb_en50494_destroy ( linuxdvb_diseqc_t *ld );