diff options
| author | Stefan Boberg <[email protected]> | 2023-12-19 10:55:11 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-12-19 10:55:11 +0100 |
| commit | 7451d3ab8aa7be6405b6bbbe5e17dcb3ea29e766 (patch) | |
| tree | 67b166d09365c45c43d7d446a6f0816c1428274b /src/zenserver | |
| parent | various TSAN/ASAN/LeakAnalyzer fixes (#622) (diff) | |
| download | zen-7451d3ab8aa7be6405b6bbbe5e17dcb3ea29e766.tar.xz zen-7451d3ab8aa7be6405b6bbbe5e17dcb3ea29e766.zip | |
ensure we can build without trace (#619)
`xmake config -zentrace=n` would previously not build cleanly
Diffstat (limited to 'src/zenserver')
| -rw-r--r-- | src/zenserver/config.cpp | 2 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp index e3286bfb8..012925b51 100644 --- a/src/zenserver/config.cpp +++ b/src/zenserver/config.cpp @@ -429,9 +429,11 @@ ParseConfigFile(const std::filesystem::path& Path, ServerOptions.HttpServerConfig.HttpSys.IsRequestLoggingEnabled, "httpsys-enable-request-logging"sv); +#if ZEN_WITH_TRACE ////// trace LuaOptions.AddOption("trace.host"sv, ServerOptions.TraceHost, "tracehost"sv); LuaOptions.AddOption("trace.file"sv, ServerOptions.TraceFile, "tracefile"sv); +#endif ////// stats LuaOptions.AddOption("stats.enable"sv, ServerOptions.StatsConfig.Enabled); diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index 2ee791a74..b7507bd17 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -3660,11 +3660,11 @@ namespace testutils { return Result; } - uint64_t GetCompressedOffset(const CompressedBuffer& Buffer, uint64 RawOffset) + uint64_t GetCompressedOffset(const CompressedBuffer& Buffer, uint64_t RawOffset) { if (RawOffset > 0) { - uint64 BlockSize = 0; + uint64_t BlockSize = 0; OodleCompressor Compressor; OodleCompressionLevel CompressionLevel; if (!Buffer.TryGetCompressParameters(Compressor, CompressionLevel, BlockSize)) |