Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

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>