Browse Source

Use lowercase when including Windows headers

pull/2/head
staphen 4 years ago
parent
commit
b847cae274
No known key found for this signature in database
GPG Key ID: E6D757EEF0CE235F
  1. 6
      include/ZeroTierOne.h
  2. 4
      node/Constants.hpp
  3. 2
      node/Mutex.hpp
  4. 4
      one.cpp
  5. 6
      osdep/Binder.hpp
  6. 6
      osdep/Http.hpp
  7. 4
      osdep/ManagedRoute.cpp
  8. 2
      osdep/OSUtils.cpp
  9. 6
      osdep/OSUtils.hpp
  10. 6
      osdep/Phy.hpp
  11. 4
      osdep/Thread.hpp
  12. 6
      osdep/WindowsEthernetTap.cpp
  13. 6
      service/OneService.cpp
  14. 6
      service/SoftwareUpdater.cpp
  15. 2
      windows/ZeroTierOne/ServiceBase.h
  16. 4
      windows/ZeroTierOne/ZeroTierOneService.cpp

6
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>

4
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__

2
node/Mutex.hpp

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

4
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>

6
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

6
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>

4
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

2
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

6
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>

6
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)

4
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"

6
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>

6
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>

6
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

2
windows/ZeroTierOne/ServiceBase.h

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

4
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>

Loading…
Cancel
Save