Merge branch 'master' of https://gitea.fhgr.ch/schurtisimon/StudyPlanner
# Conflicts: # src/planner.cbugfix
commit
e27e6f0b28
|
@ -15,11 +15,11 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#define ctime_r(T,Tm) (localtime_s(Tm,T) ? NULL:Tm)
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
_WIN32 #define ctime_r(T, Tm)(localtime_s(Tm, T) ? NULL : Tm)
|
||||||
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
|
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
|
||||||
|
#endif /* ifdef _WIN32 */
|
||||||
|
|
||||||
typedef unsigned int uint;
|
|
||||||
|
|
||||||
const uint intervalLen = 45; // min
|
const uint intervalLen = 45; // min
|
||||||
const uint pauseLen = 10; //
|
const uint pauseLen = 10; //
|
||||||
|
|
3
src/ui.c
3
src/ui.c
|
@ -13,8 +13,9 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
|
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *dbName = "db.csv";
|
const char *dbName = "db.csv";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue