diff options
| author | lizzie <lizzie@eden-emu.dev> | 2025-08-15 04:12:45 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-08-15 04:12:45 +0200 |
| commit | e807e32b1aee1daff61b8ebf61f7b38bd895a8c9 (patch) | |
| tree | 3e01449fd9ef0b39f87cf304d13d6690a4337bc8 /src/common | |
| parent | c39e3bece60fb0af6fa1652bee87c2cb8f75dd80 (diff) | |
[compat] fix solaris Qt build (#194)
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/194
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/android/multiplayer/multiplayer.cpp | 18 | ||||
| -rw-r--r-- | src/common/host_memory.cpp | 35 |
2 files changed, 25 insertions, 28 deletions
diff --git a/src/common/android/multiplayer/multiplayer.cpp b/src/common/android/multiplayer/multiplayer.cpp index 26bb800ce2..ff57eedec3 100644 --- a/src/common/android/multiplayer/multiplayer.cpp +++ b/src/common/android/multiplayer/multiplayer.cpp @@ -205,8 +205,8 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress std::string token; // TODO(alekpop): properly handle the compile definition, it's not working right -//#ifdef ENABLE_WEB_SERVICE -// LOG_INFO(WebService, "Web Service enabled"); +#ifdef ENABLE_WEB_SERVICE + LOG_INFO(WebService, "Web Service enabled"); if (isPublic) { WebService::Client client(Settings::values.web_api_url.GetValue(), Settings::values.eden_username.GetValue(), @@ -220,9 +220,9 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress LOG_INFO(WebService, "Successfully requested external JWT: size={}", token.size()); } } -//#else -// LOG_INFO(WebService, "Web Service disabled"); -//#endif +#else + LOG_ERROR(WebService, "Web Service disabled"); +#endif member->Join(username, ipaddress.c_str(), static_cast<u16>(port), 0, Network::NoPreferredIP, password, token); @@ -432,12 +432,12 @@ std::vector<std::string> AndroidMultiplayer::NetPlayGetBanList() { std::unique_ptr<Network::VerifyUser::Backend> AndroidMultiplayer::CreateVerifyBackend(bool use_validation) { std::unique_ptr<Network::VerifyUser::Backend> verify_backend; if (use_validation) { -//#ifdef ENABLE_WEB_SERVICE +#ifdef ENABLE_WEB_SERVICE verify_backend = std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue()); -//#else -// verify_backend = std::make_unique<Network::VerifyUser::NullBackend>(); -//#endif +#else + verify_backend = std::make_unique<Network::VerifyUser::NullBackend>(); +#endif } else { verify_backend = std::make_unique<Network::VerifyUser::NullBackend>(); } diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 9e34cd3ac6..949cd188f3 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp @@ -442,16 +442,15 @@ static int shm_open_anon(int flags, mode_t mode) { for (char *fill = start; fill < limit; r /= 8) *fill++ = '0' + (r % 8); int fd = shm_open(name, flags, mode); - if (fd != -1) - return ([](const char *name, int fd) { - if (shm_unlink(name) == -1) { - int tmp = errno; - close(fd); - errno = tmp; - return -1; - } - return fd; - })(name, fd); + if (fd != -1) { + if (shm_unlink(name) == -1) { + int tmp = errno; + close(fd); + errno = tmp; + return -1; + } + return fd; + } if (errno != EEXIST) break; } @@ -464,15 +463,13 @@ static int shm_open_anon(int flags, mode_t mode) { int fd; if ((fd = shm_mkstemp(name)) == -1) return -1; - return ([](const char *name, int fd) { - if (shm_unlink(name) == -1) { - int tmp = errno; - close(fd); - errno = tmp; - return -1; - } - return fd; - })(name, fd); + if (shm_unlink(name) == -1) { + int tmp = errno; + close(fd); + errno = tmp; + return -1; + } + return fd; } #endif |