Skip to content

Commit ddcc600

Browse files
committed
fix: try to fix windows winsock2 problem
1 parent c88476c commit ddcc600

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/lobby/credentials/secret.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,16 @@ secret::SecretStorage::store(const std::string& key, const std::string& value, b
141141
#include <fmt/format.h>
142142
#include <spdlog/spdlog.h>
143143

144+
#ifndef NOMINMAX
145+
#define NOMINMAX
146+
#endif
147+
#ifndef _WINSOCKAPI_
148+
#define _WINSOCKAPI_
149+
#endif
150+
#include <WTypesbase.h>
151+
#include <ncrypt.h>
152+
153+
144154
namespace {
145155

146156
namespace constants {

src/lobby/credentials/secret.hpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,10 @@
1212
#include <keyutils.h>
1313
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
1414

15-
#ifndef NOMINMAX
16-
#define NOMINMAX
17-
#endif
18-
19-
#include <winsock2.h>
20-
21-
#include <windows.h>
22-
23-
#include <ncrypt.h>
15+
#include <basetsd.h>
16+
namespace oopetris::secret::details {
17+
using NCRYPT_PROV_HANDLE = ULONG_PTR;
18+
} // namespace oopetris::secret::details
2419

2520
#endif
2621

@@ -37,7 +32,7 @@ namespace secret {
3732
#elif defined(__CONSOLE__) || defined(__APPLE__)
3833
std::string m_file_path;
3934
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
40-
NCRYPT_PROV_HANDLE m_phProvider;
35+
oopetris::secret::details::NCRYPT_PROV_HANDLE m_phProvider;
4136
#endif
4237

4338

0 commit comments

Comments
 (0)