diff options
author | pg9182 <96569817+pg9182@users.noreply.github.com> | 2022-08-08 06:12:11 -0400 |
---|---|---|
committer | GeckoEidechse <gecko.eidechse+git@pm.me> | 2022-08-14 14:37:24 +0200 |
commit | c0e8e576df16171da6f0e68cbfa18123e8d1e7e0 (patch) | |
tree | fb157acfec3c1a510644481aade8f7115efb2295 /NorthstarDedicatedTest/masterserver.h | |
parent | d20cf6f08af37830d3bfc934cef356fa6a1aa102 (diff) | |
download | NorthstarLauncher-c0e8e576df16171da6f0e68cbfa18123e8d1e7e0.tar.gz NorthstarLauncher-c0e8e576df16171da6f0e68cbfa18123e8d1e7e0.zip |
Fix most clang/mingw issues (#226)
- Fix include case.
- Replace MSVC-specific align with standard alignas.
- Type fixes.
- Delete operator noexcept.
- A few other minor issues.
- clang-format everything.
- Use c++20 instead of c++17.
- Rewrite ERROR macro for launcher_wsock32_proxy.
- Use a plain ifstream for the audio.cpp wavStream.
Note: When compiling with clang, you'll need -municode.
Related to #212.
Diffstat (limited to 'NorthstarDedicatedTest/masterserver.h')
-rw-r--r-- | NorthstarDedicatedTest/masterserver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NorthstarDedicatedTest/masterserver.h b/NorthstarDedicatedTest/masterserver.h index 8dd42d77..e4dcb954 100644 --- a/NorthstarDedicatedTest/masterserver.h +++ b/NorthstarDedicatedTest/masterserver.h @@ -1,6 +1,6 @@ #pragma once #include "convar.h" -#include <WinSock2.h> +#include <winsock2.h> #include <string> #include <cstring> struct RemoteModInfo @@ -132,4 +132,4 @@ void InitialiseSharedMasterServer(HMODULE baseAddress); extern MasterServerManager* g_MasterServerManager; extern ConVar* Cvar_ns_masterserver_hostname; -extern ConVar* Cvar_ns_server_password;
\ No newline at end of file +extern ConVar* Cvar_ns_server_password; |