From 14541ae2583f2ce1c8b8ebc2dd6cc49235207fc6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 10 Oct 2017 15:51:16 +0200 Subject: Add checks for HAVE_GPL to various GPL-only source files This should actually cover all of them, if you take into account that some unchanged GPL source files include header files with such checks. Also this was done already for the libaf derived code. This is only for "safety" and to avoid misunderstandings. --- stream/audio_in.h | 4 ++++ stream/dvbin.h | 4 ++++ stream/frequencies.h | 5 +++++ stream/stream_cdda.c | 5 +++++ stream/stream_dvb.c | 4 ++++ stream/stream_dvd_common.h | 5 +++++ stream/stream_dvdnav.c | 4 ++++ stream/stream_smb.c | 5 +++++ stream/tv.h | 5 +++++ 9 files changed, 41 insertions(+) (limited to 'stream') diff --git a/stream/audio_in.h b/stream/audio_in.h index 28d7d335cf..6b714f7306 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -24,6 +24,10 @@ #include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + struct mp_log; #if HAVE_ALSA diff --git a/stream/dvbin.h b/stream/dvbin.h index 5329179b0f..284ccbd450 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.h @@ -11,6 +11,10 @@ #include "config.h" #include "stream.h" +#if !HAVE_GPL +#error GPL only +#endif + #define SLOF (11700 * 1000UL) #define LOF1 (9750 * 1000UL) #define LOF2 (10600 * 1000UL) diff --git a/stream/frequencies.h b/stream/frequencies.h index be4a33a519..e215d023b5 100644 --- a/stream/frequencies.h +++ b/stream/frequencies.h @@ -125,4 +125,9 @@ struct CHANLISTS { extern const struct CHANLISTS chanlists[]; extern const int chancount; +#include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + #endif /* MPLAYER_FREQUENCIES_H */ diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index 2a8eb7553f..7fd461a361 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -46,6 +46,11 @@ #include "common/msg.h" +#include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + typedef struct cdda_params { cdrom_drive_t *cd; cdrom_paranoia_t *cdp; diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 7514e42fc0..c53753ad31 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -58,6 +58,10 @@ #include "dvbin.h" #include "dvb_tune.h" +#if !HAVE_GPL +#error GPL only +#endif + #define MAX_ADAPTERS 16 #define CHANNEL_LINE_LEN 256 #define min(a, b) ((a) <= (b) ? (a) : (b)) diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index 8caa2819cf..dccf49246c 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.h @@ -22,6 +22,11 @@ #include #include "stream.h" +#include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + extern const char * const dvd_audio_stream_channels[6]; extern const char * const dvd_audio_stream_types[8]; diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index fc7ddfdc58..16a3d11d70 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -19,6 +19,10 @@ #include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + #include #include #include diff --git a/stream/stream_smb.c b/stream/stream_smb.c index 79243a4c79..4376f71ee6 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -26,6 +26,11 @@ #include "stream.h" #include "options/m_option.h" +#include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + struct priv { int fd; }; diff --git a/stream/tv.h b/stream/tv.h index 64be22298b..f37e715515 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -26,6 +26,11 @@ #include "osdep/endian.h" +#include "config.h" +#if !HAVE_GPL +#error GPL only +#endif + struct mp_log; typedef struct tv_params { -- cgit v1.2.3