This commit is contained in:
parent
a9e8b615bd
commit
41fb41b8d1
|
@ -14,8 +14,8 @@ CC = gcc
|
||||||
PRODORDEV += -ggdb3
|
PRODORDEV += -ggdb3
|
||||||
|
|
||||||
CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC
|
CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC
|
||||||
CPPFLAGS = -fPIC -D_GNU_SOURCE
|
CPPFLAGS = -fPIC -D_GNU_SOURCE -DACLOC=$(LOCATION)
|
||||||
CXXFLAGS += -D_GNU_SOURCE -O0
|
CXXFLAGS += -D_GNU_SOURCE -O0 -DACLOC=$(LOCATION)
|
||||||
|
|
||||||
ifeq ($(LOCATION),debian7)
|
ifeq ($(LOCATION),debian7)
|
||||||
XALAN_LIB_DIR = /usr/local/lib/
|
XALAN_LIB_DIR = /usr/local/lib/
|
||||||
|
|
|
@ -29,8 +29,11 @@ public:
|
||||||
static struct timespec msOffset2abs(long long msOffset);
|
static struct timespec msOffset2abs(long long msOffset);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
#if ACLOC != osx10.8
|
||||||
static clockid_t getClock();
|
static clockid_t getClock();
|
||||||
|
#else
|
||||||
|
static clock_t getClock();
|
||||||
|
#endif
|
||||||
|
|
||||||
static bool useRealTime;
|
static bool useRealTime;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue