From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 20 Dec 2010 12:21:27 +0000 (+0100)
Subject: Merge branch 'obi/master' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=41a34ba7cc10000dbc950203aed2285879b5b11d;hp=31a7ee4d64f718ac076f3d2037427877435c4101

Merge branch 'obi/master' into experimental
---

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index aa5d34d..c963c76 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -185,7 +185,7 @@ public:
 		{
 			uint16_t caid;
 			int capid;
-			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+			bool operator< (const struct capid_pair &t) const { return t.caid < caid; }
 		};
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
diff --git a/main/Makefile.am b/main/Makefile.am
index 888898f..a65b4ac 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -71,7 +71,7 @@ BUILT_SOURCES = version-intermediate.h
 .PHONY: version-intermediate.h
 version-intermediate.h:
 	$(AM_V_GEN)touch $@
-	-$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@; \
+	-$(AM_V_at)[ -n "$(ENIGMA2_COMMIT_DATE)" ] && echo "#define ENIGMA2_COMMIT_DATE \"$(ENIGMA2_COMMIT_DATE)\"" >> $@
 	-$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
 	-$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
 	$(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h