X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fcommon.h;h=5eee7ccd0688f8ac089c5376a6896be26ec19141;hb=3521cee9644bd955fd053c5b4ea173efd1e78fe8;hp=a690149a1a175b330435dcf82fa990b471d5b699;hpb=bbd64b3c32d79d247c7535693aafa20a3baba6b8;p=matches%2FMCTX3420.git

diff --git a/server/common.h b/server/common.h
index a690149..5eee7cc 100644
--- a/server/common.h
+++ b/server/common.h
@@ -6,13 +6,25 @@
 #ifndef _COMMON_H
 #define _COMMON_H
 
+/** Defines required to allow various C standard functions to be used **/
 #define _POSIX_C_SOURCE 200809L
-#define _BSD_SOURCE
+//#define _BSD_SOURCE
 #define _XOPEN_SOURCE 600
+#define _GNU_SOURCE
+/** Determine if we're running on the BBB **/
+#ifdef __arm__
+	#define _BBB
+#else
+	//#warning This software was designed for the BeagleBone Black. Some features may not work.
+#endif //__arm__
 
 /** The current API version **/
 #define API_VERSION 0
 
+//#define REALTIME_VERSION
+
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -23,14 +35,25 @@
 #include <assert.h>
 #include <sys/time.h>
 #include <time.h>
+#include <string.h>
 
 #include "log.h"
 #include "fastcgi.h"
+#include "control.h"
 
 /**Converts a timeval to a double**/
-#define TIMEVAL_TO_DOUBLE(tv) ((tv).tv_sec + 1e-6 * ((tv).tv_usec))
+#define TIMEVAL_TO_DOUBLE(tv) ((tv).tv_sec + 1e-9 * ((tv).tv_nsec))
 /**Takes the tv1-tv2 between two timevals and returns the result as a double*/
-#define TIMEVAL_DIFF(tv1, tv2) ((tv1).tv_sec - (tv2).tv_sec + 1e-6 * ((tv1).tv_usec - (tv2).tv_usec))
+#define TIMEVAL_DIFF(tv1, tv2) ((tv1).tv_sec - (tv2).tv_sec + 1e-9 * ((tv1).tv_nsec - (tv2).tv_nsec))
+/** Converts a double time value (in seconds) to a timespec **/
+#define DOUBLE_TO_TIMEVAL(value, tv) {	\
+										(tv)->tv_sec = (int)(value); \
+										(tv)->tv_nsec = ((value) - (int)(value))*1e9; \
+									}
+
+//extern bool PathExists(const char * path);
+extern bool DirExists(const char * path);
+
 
 
 #endif //_COMMON_H