Minor build fixes for Windows

Makefile

@@ -5,9 +5,9 @@ else
 DIST_BUILD_SCRIPT := ./dist.sh
 endif
 
-EXECUTABLES = cmake
-build_reqs := $(foreach exec,$(EXECUTABLES),\
-        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
+#EXECUTABLES = cmake
+#build_reqs := $(foreach exec,$(EXECUTABLES),\
+#        $(if $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))
 
 .PHONY: list
 list:

src/Controls.hpp

@@ -33,6 +33,10 @@
 #ifndef LIBZT_CONTROLS_HPP
 #define LIBZT_CONTROLS_HPP
 
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
 namespace ZeroTier {
 
 //////////////////////////////////////////////////////////////////////////////

src/Sockets.cpp

@@ -38,16 +38,9 @@
 #include "ZeroTierConstants.h"
 #include "Options.h"
 #include "Debug.hpp"
-#include "Controls.hpp"
 
 #ifdef SDK_JNI
 	#include <jni.h>
-#ifndef _MSC_VER
-	//#include <sys/socket.h>
-	//#include <sys/types.h>
-	//#include <sys/select.h>
-	//#include <sys/ioctl.h>
-#endif
 #endif
 
 namespace ZeroTier {

src/VirtualTap.cpp

@@ -79,7 +79,9 @@ VirtualTap::VirtualTap(
 	memset(vtap_full_name, 0, sizeof(vtap_full_name));
 	snprintf(vtap_full_name, sizeof(vtap_full_name), "libzt%llx", (unsigned long long)_nwid);
 	_dev = vtap_full_name;
+#ifndef _WIN32
 	::pipe(_shutdownSignalPipe);
+#endif
 	// Start virtual tap thread and stack I/O loops
 	_thread = Thread::start(this);
 }
@@ -90,13 +92,17 @@ VirtualTap::~VirtualTap()
 	nd->nwid = _nwid;
 	postEvent(ZTS_EVENT_NETWORK_DOWN, (void*)nd);
 	_run = false;
+#ifndef _WIN32
 	::write(_shutdownSignalPipe[1],"\0",1);
+#endif
 	_phy.whack();
 	lwip_remove_netif(netif);
 	netif = NULL;
 	Thread::join(_thread);
+#ifndef _WIN32
 	::close(_shutdownSignalPipe[0]);
 	::close(_shutdownSignalPipe[1]);
+#endif
 }
 
 void VirtualTap::lastConfigUpdate(uint64_t lastConfigUpdateTime)

src/lwipDriver.cpp

@@ -155,7 +155,7 @@ void lwip_driver_init()
 #if defined(_WIN32)
 	sys_init(); // Required for win32 init of critical sections
 #endif
-	void *st = sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop,
+	void *st = (void*)sys_thread_new(ZTS_LWIP_DRIVER_THREAD_NAME, main_lwip_driver_loop,
 		NULL, DEFAULT_THREAD_STACKSIZE, DEFAULT_THREAD_PRIO);
 }