Merge branch 'dev' into zeroidc

4 years ago · dceba1f2f1
18 changed files with 38 additions and 43 deletions
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@ -23,9 +23,9 @@

 // For the struct sockaddr_storage structure
 #if defined(_WIN32) || defined(_WIN64)
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
 #else /* not Windows */
 #include <arpa/inet.h>
 #include <netinet/in.h>
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@ -92,8 +92,8 @@
 #pragma warning(disable : 4101)
 #undef __UNIX_LIKE__
 #undef __BSD__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #endif

 #ifdef __NetBSD__
--- a/node/Mutex.hpp
+++ b/node/Mutex.hpp
@ -86,7 +86,7 @@ private:
 #ifdef __WINDOWS__

 #include <stdlib.h>
-#include <Windows.h>
+#include <windows.h>

 namespace ZeroTier {

--- a/node/Salsa20.hpp
+++ b/node/Salsa20.hpp
@ -15,7 +15,7 @@
 #include "Constants.hpp"
 #include "Utils.hpp"

-#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || defined(__WINDOWS__))
+#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || (defined(__WINDOWS__) && !defined(__MINGW32__)))
 #define ZT_SALSA20_SSE 1
 #endif

--- a/one.cpp
+++ b/one.cpp
@ -25,8 +25,8 @@
 #include "node/Constants.hpp"

 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <tchar.h>
 #include <wchar.h>
 #include <lmcons.h>
--- a/osdep/Binder.hpp
+++ b/osdep/Binder.hpp
@ -22,9 +22,9 @@
 #include <string.h>

 #ifdef __WINDOWS__
-#include <ShlObj.h>
-#include <WinSock2.h>
-#include <Windows.h>
+#include <shlobj.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <iphlpapi.h>
 #include <netioapi.h>
 #else
--- a/osdep/Http.hpp
+++ b/osdep/Http.hpp
@ -19,9 +19,9 @@
 #include <stdexcept>

 #if defined(_WIN32) || defined(_WIN64)
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
 #else
 #include <unistd.h>
 #include <sys/time.h>
--- a/osdep/ManagedRoute.cpp
+++ b/osdep/ManagedRoute.cpp
@ -19,8 +19,8 @@
 #include <string.h>

 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <netioapi.h>
 #include <IPHlpApi.h>
 #endif
--- a/osdep/OSUtils.cpp
+++ b/osdep/OSUtils.cpp
@ -36,7 +36,7 @@
 #ifdef __WINDOWS__
 #include <windows.h>
 #include <wincrypt.h>
-#include <ShlObj.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 #endif
--- a/osdep/OSUtils.hpp
+++ b/osdep/OSUtils.hpp
@ -28,9 +28,9 @@
 #include "../node/InetAddress.hpp"

 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <Shlwapi.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlwapi.h>
 #else
 #include <unistd.h>
 #include <errno.h>
--- a/osdep/Phy.hpp
+++ b/osdep/Phy.hpp
@ -23,9 +23,9 @@

 #if defined(_WIN32) || defined(_WIN64)

-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>

 #define ZT_PHY_SOCKFD_TYPE SOCKET
 #define ZT_PHY_SOCKFD_NULL (INVALID_SOCKET)
--- a/osdep/PortMapper.cpp
+++ b/osdep/PortMapper.cpp
@ -47,14 +47,9 @@
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>
 #else
-#ifdef __ANDROID__
-#include "miniupnpc.h"
-#include "upnpcommands.h"
-#else
 #include "../ext/miniupnpc/miniupnpc.h"
 #include "../ext/miniupnpc/upnpcommands.h"
 #endif
-#endif

 #ifdef ZT_USE_SYSTEM_NATPMP
 #include <natpmp.h>
--- a/osdep/Thread.hpp
+++ b/osdep/Thread.hpp
@ -20,8 +20,8 @@

 #ifdef __WINDOWS__

-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <string.h>

 #include "../node/Mutex.hpp"
--- a/osdep/WindowsEthernetTap.cpp
+++ b/osdep/WindowsEthernetTap.cpp
@ -15,14 +15,14 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <tchar.h>
 #include <malloc.h>
 #include <winreg.h>
 #include <wchar.h>
 #include <ws2ipdef.h>
-#include <WS2tcpip.h>
+#include <ws2tcpip.h>
 #include <IPHlpApi.h>
 #include <nldef.h>
 #include <netioapi.h>
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@ -56,9 +56,9 @@
 #include <zeroidc.h>

 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <ShlObj.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 //#include <unistd.h>
--- a/service/SoftwareUpdater.cpp
+++ b/service/SoftwareUpdater.cpp
@ -20,9 +20,9 @@
 #include "../version.h"

 #ifdef __WINDOWS__
-#include <WinSock2.h>
-#include <Windows.h>
-#include <ShlObj.h>
+#include <winsock2.h>
+#include <windows.h>
+#include <shlobj.h>
 #include <netioapi.h>
 #include <iphlpapi.h>
 #else
--- a/windows/ZeroTierOne/ServiceBase.h
+++ b/windows/ZeroTierOne/ServiceBase.h
@ -18,7 +18,7 @@

 #pragma once

-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>

 class CServiceBase
--- a/windows/ZeroTierOne/ZeroTierOneService.cpp
+++ b/windows/ZeroTierOne/ZeroTierOneService.cpp
@ -15,8 +15,8 @@

 #if defined(_WIN32) || defined(_WIN64)

-#include <WinSock2.h>
-#include <Windows.h>
+#include <winsock2.h>
+#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>