diff options
author | Grant Limberg <grant.limberg@zerotier.com> | 2018-10-24 12:08:48 -0700 |
---|---|---|
committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-10-24 12:08:48 -0700 |
commit | f901b9dd6bd877c19fca6b95128c583be6e25d80 (patch) | |
tree | 512e8777426ddf6f717d6b216537ab07d063810a /service | |
parent | d87fcca17663bc256f64fb19d74540115f9d0565 (diff) | |
parent | 7c726533850eb0a6f3a40d72f42bd50a8e93e621 (diff) | |
download | infinitytier-f901b9dd6bd877c19fca6b95128c583be6e25d80.tar.gz infinitytier-f901b9dd6bd877c19fca6b95128c583be6e25d80.zip |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
Diffstat (limited to 'service')
-rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 91d10d22..9d3a9599 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -67,7 +67,7 @@ #include <ShlObj.h> #include <netioapi.h> #include <iphlpapi.h> -#include <unistd.h> +//#include <unistd.h> #define stat _stat #else #include <sys/types.h> |