git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bsod: Don't assign sa_handler
[enigma2.git]
/
main
/
enigma.cpp
diff --git
a/main/enigma.cpp
b/main/enigma.cpp
index 3ea4afb71226129e6b5792c81875163eee249d92..6bc35714fd440d5db0cff16e75b298a335d84a52 100644
(file)
--- a/
main/enigma.cpp
+++ b/
main/enigma.cpp
@@
-28,6
+28,7
@@
#include <lib/python/python.h>
#include "bsod.h"
#include <lib/python/python.h>
#include "bsod.h"
+#include "version_info.h"
#include <gst/gst.h>
#include <gst/gst.h>
@@
-296,22
+297,10
@@
void quitMainloop(int exitCode)
eApp->quit(0);
}
eApp->quit(0);
}
-#include "version.h"
-
const char *getEnigmaVersionString()
{
const char *getEnigmaVersionString()
{
- std::string date =
-#ifdef ENIGMA2_LAST_CHANGE_DATE
- ENIGMA2_LAST_CHANGE_DATE;
-#else
- __DATE__;
-#endif
- std::string branch =
-#ifdef ENIGMA2_BRANCH
- ENIGMA2_BRANCH;
-#else
- "HEAD";
-#endif
+ std::string date = enigma2_date;
+ std::string branch = enigma2_branch;
return std::string(date + '-' + branch).c_str();
}
return std::string(date + '-' + branch).c_str();
}