196d555092
Contains everything from #940, except on top of master now. Also added a postmarketos-ui-luna package to be a meta- package for all of the Luna work. Every component included here builds & runs, but isn't functional without a handful more packages.
25 lines
695 B
Diff
25 lines
695 B
Diff
diff --git a/Src/BackupManager.cpp b/Src/BackupManager.cpp
|
|
index 2b34936..f90239f 100644
|
|
--- a/Src/BackupManager.cpp
|
|
+++ b/Src/BackupManager.cpp
|
|
@@ -19,6 +19,7 @@
|
|
#include <string>
|
|
|
|
//for basename()...
|
|
+#include <libgen.h>
|
|
#include <string.h>
|
|
#include <map>
|
|
#include "BackupManager.h"
|
|
diff --git a/Src/BroadcastTimeHandler.cpp b/Src/BroadcastTimeHandler.cpp
|
|
index a65f96a..4a75856 100644
|
|
--- a/Src/BroadcastTimeHandler.cpp
|
|
+++ b/Src/BroadcastTimeHandler.cpp
|
|
@@ -163,7 +163,7 @@ namespace {
|
|
|
|
localTm.tm_isdst = -1; // mktime should lookup TZ rules
|
|
|
|
- return timelocal(&localTm);
|
|
+ return mktime(&localTm);
|
|
}
|
|
|
|
time_t toTimeT(const pbnjson::JValue &value)
|