diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index df2a758..1541904 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -14,8 +14,8 @@ CC = gcc PRODORDEV += -ggdb3 CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC -CPPFLAGS = -fPIC -D_GNU_SOURCE -CXXFLAGS += -D_GNU_SOURCE -O0 +CPPFLAGS = -fPIC -D_GNU_SOURCE -DACLOC=$(LOCATION) +CXXFLAGS += -D_GNU_SOURCE -O0 -DACLOC=$(LOCATION) ifeq ($(LOCATION),debian7) XALAN_LIB_DIR = /usr/local/lib/ diff --git a/ACTK1_0/session/Timer.hpp b/ACTK1_0/session/Timer.hpp index 1ca14ec..4aff21b 100644 --- a/ACTK1_0/session/Timer.hpp +++ b/ACTK1_0/session/Timer.hpp @@ -29,8 +29,11 @@ public: static struct timespec msOffset2abs(long long msOffset); private: - +#if ACLOC != osx10.8 static clockid_t getClock(); +#else + static clock_t getClock(); +#endif static bool useRealTime;