Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-08-20 12:00:32 +02:00
parent 2068136118 61eb1e6002
commit f9167b0b69
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Basics/operating-system.h
View File

@ -634,7 +634,7 @@
#define TRI_HAVE_LINENOISE 1 #define TRI_HAVE_LINENOISE 1
#define GLOBAL_TIMEZONE timezone #define GLOBAL_TIMEZONE _timezone
#define TRI_HAVE_GLOBAL_TIMEZONE_PROTO 1 #define TRI_HAVE_GLOBAL_TIMEZONE_PROTO 1
#define YY_NO_UNISTD_H 1 #define YY_NO_UNISTD_H 1