diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-19 14:13:23 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-19 14:13:23 -0700 |
| commit | 8c6b833fb3a0185e7430db6d4c95ce3d087ced33 (patch) | |
| tree | 88f1b2bb5faf71b1f4b431ff65c773e5c07d4f41 | |
| parent | b62296a40bd4ed2d01404679cdc9512a1f18bcca (diff) | |
| parent | fc7728212f261b081343ee4b9e801cee0d60ad37 (diff) | |
| download | infinitytier-8c6b833fb3a0185e7430db6d4c95ce3d087ced33.tar.gz infinitytier-8c6b833fb3a0185e7430db6d4c95ce3d087ced33.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
| -rw-r--r-- | controller/JSONDB.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/JSONDB.cpp b/controller/JSONDB.cpp index 216470b4..ea295688 100644 --- a/controller/JSONDB.cpp +++ b/controller/JSONDB.cpp @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdint.h> -#ifndef __WINDOWS__ +#ifndef _WIN32 #include <unistd.h> #include <fcntl.h> #include <sys/time.h> |