Pārlūkot izejas kodu

Use lowercase when including Windows headers

staphen 3 gadi atpakaļ
vecāks
revīzija
1c956494a4

+ 3 - 3
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>

+ 2 - 2
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__

+ 1 - 1
node/Mutex.hpp

@@ -86,7 +86,7 @@ private:
 #ifdef __WINDOWS__
 
 #include <stdlib.h>
-#include <Windows.h>
+#include <windows.h>
 
 namespace ZeroTier {
 

+ 2 - 2
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>

+ 3 - 3
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

+ 3 - 3
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>

+ 2 - 2
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

+ 1 - 1
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

+ 3 - 3
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>

+ 3 - 3
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)

+ 2 - 2
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"

+ 3 - 3
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>

+ 3 - 3
service/OneService.cpp

@@ -54,9 +54,9 @@
 #include "SoftwareUpdater.hpp"
 
 #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>

+ 3 - 3
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

+ 1 - 1
windows/ZeroTierOne/ServiceBase.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
 
 class CServiceBase

+ 2 - 2
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>