diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 13:21:27 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-20 13:21:27 +0100 |
| commit | 41a34ba7cc10000dbc950203aed2285879b5b11d (patch) | |
| tree | 2e84da9963d891c73fa80eacbe8548230e5cd8ba | |
| parent | 31a7ee4d64f718ac076f3d2037427877435c4101 (diff) | |
| parent | 3c282ef6f5bd54f2b0f4cb407d075cf321405b84 (diff) | |
| download | enigma2-41a34ba7cc10000dbc950203aed2285879b5b11d.tar.gz enigma2-41a34ba7cc10000dbc950203aed2285879b5b11d.zip | |
Merge branch 'obi/master' into experimental
| -rw-r--r-- | lib/dvb/pmt.h | 2 | ||||
| -rw-r--r-- | main/Makefile.am | 2 |
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 |