git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add transfer bps to service interface (requires touching enigma_python.i)
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index be9d9a537326ac5a28605526b49bc753627664fb..3f420b4bb6ee2e996e5a863dc42d457fc8073ae5 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-309,14
+309,21
@@
void quitMainloop(int exitCode)
const char *getEnigmaVersionString()
{
const char *getEnigmaVersionString()
{
- return
-#ifdef ENIGMA2_
CHECKOUT_TAG
- ENIGMA2_
CHECKOUT_TAG
+ std::string date =
+#ifdef ENIGMA2_
LAST_CHANGE_DATE
+ ENIGMA2_
LAST_CHANGE_DATE;
#else
#else
- "HEAD"
+ __DATE__;
#endif
#endif
- "-" __DATE__;
+ std::string branch =
+#ifdef ENIGMA2_BRANCH
+ ENIGMA2_BRANCH;
+#else
+ "HEAD";
+#endif
+ return std::string(date + '-' + branch).c_str();
}
}
+
#include <malloc.h>
void dump_malloc_stats(void)
#include <malloc.h>
void dump_malloc_stats(void)