From b453d2f57e0f5b68d0078d3d571fa84f37196c31 Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Mon, 11 Apr 2011 19:28:12 +0000 Subject: [PATCH] AVATAR code generator: upgrade to be supported under MACOS --- executablecode/Makefile | 3 +++ executablecode/Makefile.src | 2 +- executablecode/src/mytimelib.h | 14 ++++++++++++++ executablecode/src/random.c | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/executablecode/Makefile b/executablecode/Makefile index a56336953d..5b76fc290f 100755 --- a/executablecode/Makefile +++ b/executablecode/Makefile @@ -8,6 +8,9 @@ OPT = -O1 -pthread #LOPT = -O1 -pthread -ldl -lnsl -lsocket #Linux LOPT = -O1 -pthread -ldl -lrt +LOPT_MAC = -O1 -pthread -ldl + +LOPT = $(LOPT_MAC) DEBUG = -g OTHER = -Wall diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src index fa78915f96..bf52322a40 100755 --- a/executablecode/Makefile.src +++ b/executablecode/Makefile.src @@ -1 +1 @@ -SRCS = generated_src/main.c generated_src/Wallet.c generated_src/CoffeeMachine.c generated_src/TeaButton.c generated_src/CoffeeButton.c \ No newline at end of file +SRCS = generated_src/main.c generated_src/Wallet.c generated_src/CoffeeMachine.c generated_src/CoffeeButton.c generated_src/TeaButton.c \ No newline at end of file diff --git a/executablecode/src/mytimelib.h b/executablecode/src/mytimelib.h index 8aba27a86d..2a34560156 100644 --- a/executablecode/src/mytimelib.h +++ b/executablecode/src/mytimelib.h @@ -2,6 +2,20 @@ #define MYTIMELIB_H #include <time.h> +#include <sys/time.h> + +#ifndef CLOCK_REALTIME +#define CLOCK_REALTIME 0 + +void clock_gettime(int x, struct timespec *ts) { + struct timeval tv; + gettimeofday(&tv, NULL); + ts->tv_sec = tv.tv_sec; + ts->tv_nsec = tv.tv_usec * 1000; +} + +#endif + // in usec void addTime(struct timespec *src1, struct timespec *src2, struct timespec *dest); diff --git a/executablecode/src/random.c b/executablecode/src/random.c index 287b219dbd..1d4bba587b 100644 --- a/executablecode/src/random.c +++ b/executablecode/src/random.c @@ -8,6 +8,8 @@ #include "debug.h" #include <math.h> +#include "mytimelib.h" + int computeRandom(int min, int max) { if (min == max) { return min; -- GitLab