aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/dvb/pmt.h2
-rw-r--r--main/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index aa5d34d9..c963c761 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 888898f4..a65b4ac7 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