Merge branch 'equivalents' of ubsatserv into equivalents

Conflicts:
	epghandler.c

2 files changed, 12 insertions, 5 deletions

diff --git a/util.c b/util.c
index d2a5c36..bbfffb2 100644
--- a/util.c
+++ b/util.c
@@ -11,6 +11,13 @@
 namespace util
 {
 
+int AvailableSources[32];
+int NumberOfAvailableSources = 0;
+
+int Yesterday;
+int YesterdayEpoch;
+int YesterdayEpochUTC;
+
 cChannel *GetChannelByID(tChannelID & channelID, bool searchOtherPos)
 {
   cChannel *VC = Channels.GetByChannelID(channelID, true);
diff --git a/util.h b/util.h
index 41a8204..be2c3d0 100644
--- a/util.h
+++ b/util.h
@@ -13,12 +13,12 @@ struct tChannelID;
 
 namespace util
 {
-int AvailableSources[32];
-int NumberOfAvailableSources = 0;
+extern int AvailableSources[32];
+extern int NumberOfAvailableSources;
 
-int Yesterday;
-int YesterdayEpoch;
-int YesterdayEpochUTC;
+extern int Yesterday;
+extern int YesterdayEpoch;
+extern int YesterdayEpochUTC;
 
 void AddEvent(cEvent *event, tChannelID ChannelID);