From 633744de41c0892b8c874ff05e943cd460d15c41 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 9 May 2017 14:28:35 +0200 Subject: [PATCH] gcc fixes for the last commit --- src/input/mpegts/linuxdvb/linuxdvb_lnb.c | 11 +++++++---- src/input/mpegts/linuxdvb/linuxdvb_private.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) 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 ); -- 2.47.3