Skip to content

Commit f5e59ac

Browse files
committed
Fix compilation issues after update to GCC 15 (pt. 1)
1 parent 798a480 commit f5e59ac

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Server/dbconmy/premake5.lua

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,11 @@ project "Dbconmy"
5656
if GLIBC_COMPAT then
5757
filter { "system:linux" }
5858
buildoptions { "-pthread" }
59-
linkoptions { "-l:libmysqlclient.a", "-pthread", "-lssl", "-lcrypto" }
60-
links { "z", "dl", "m" }
59+
linkoptions { "-pthread" }
60+
links { "z", "dl", "m", "mysqlclient", "zstd", "ssl", "crypto", "resolv" }
6161
else
6262
filter "system:not windows"
6363
links { "mysqlclient" }
64-
filter {"system:linux", "platforms:x86"}
65-
libdirs { "/usr/lib32/mysql" }
66-
filter {"system:linux", "platforms:x64"}
67-
libdirs { "/usr/lib64/mysql" }
6864
end
6965

7066
filter { "system:windows", "platforms:x64" }

Shared/sdk/SharedUtil.Legacy.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ namespace SharedUtil
2828
}
2929
} // namespace SharedUtil
3030

31-
#define PRId64 "lld"
32-
#define PRIx64 "llx"
31+
#ifndef PRId64
32+
#define PRId64 "lld"
33+
#endif
34+
#ifndef PRIx64
35+
#define PRIx64 "llx"
36+
#endif
3337

3438
// Crazy thing
3539
#define LOCAL_FUNCTION_START struct local {

vendor/lua/src/lapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ LUA_API const char *lua_tolstring (lua_State *L, int idx, size_t *len) {
386386
LUA_API unsigned (lua_tostringhash) (lua_State *L, int idx) {
387387
StkId o = index2adr(L, idx);
388388
if (!ttisstring(o))
389-
return NULL;
389+
return 0;
390390

391391
return tsvalue(o)->hash;
392392
}

vendor/zlib/gzguts.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444

4545
#ifdef _WIN32
4646
# include <stddef.h>
47+
#else
48+
# include <unistd.h>
4749
#endif
4850

4951
#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)

0 commit comments

Comments
 (0)