From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 23 Feb 2016 07:20:12 +0000 (+0100)
Subject: don't define linuxdvb_ca_t twice, fixes #3587
X-Git-Tag: v4.2.1~986
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e1dc45a372dcfd2b35804c18c04f2512b815004;p=thirdparty%2Ftvheadend.git

don't define linuxdvb_ca_t twice, fixes #3587
---

diff --git a/src/descrambler/dvbcam.h b/src/descrambler/dvbcam.h
index f0078d95b..158635a13 100644
--- a/src/descrambler/dvbcam.h
+++ b/src/descrambler/dvbcam.h
@@ -24,12 +24,13 @@ struct elementary_stream;
 
 #if ENABLE_LINUXDVB_CA
 
-typedef struct linuxdvb_ca linuxdvb_ca_t;
+struct linuxdvb_ca;
+
 void dvbcam_init(void);
 void dvbcam_service_start(struct service *t);
 void dvbcam_service_stop(struct service *t);
-void dvbcam_register_cam(linuxdvb_ca_t * lca, uint8_t slot, uint16_t * caids, int num_caids);
-void dvbcam_unregister_cam(linuxdvb_ca_t * lca, uint8_t slot);
+void dvbcam_register_cam(struct linuxdvb_ca *lca, uint8_t slot, uint16_t * caids, int num_caids);
+void dvbcam_unregister_cam(struct linuxdvb_ca *lca, uint8_t slot);
 void dvbcam_pmt_data(mpegts_service_t *s, const uint8_t *ptr, int len);
 
 #endif