From 7dedd6dd72a441f7bb499e9826429abb1e08947b Mon Sep 17 00:00:00 2001 From: Mathias Gibbens Date: Fri, 12 Apr 2024 22:24:53 +0000 Subject: [PATCH 1/2] raft: Fix build on alpha Signed-off-by: Mathias Gibbens --- src/raft/uv_fs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/raft/uv_fs.c b/src/raft/uv_fs.c index b4bf42114..de380d21d 100644 --- a/src/raft/uv_fs.c +++ b/src/raft/uv_fs.c @@ -704,7 +704,11 @@ static int probeDirectIO(int fd, size_t *size, char *errmsg) default: /* UNTESTED: this is an unsupported file system. */ -#if defined(__s390x__) +#if defined(__alpha__) + ErrMsgPrintf(errmsg, + "unsupported file system: %x", + fs_info.f_type); +#elif defined(__s390x__) ErrMsgPrintf(errmsg, "unsupported file system: %ux", fs_info.f_type); From 3822a6d75b2ec581fb74c1875ff52c5299cfcc40 Mon Sep 17 00:00:00 2001 From: Mathias Gibbens Date: Fri, 12 Apr 2024 22:25:36 +0000 Subject: [PATCH 2/2] raft: Fix build on x32 Signed-off-by: Mathias Gibbens --- src/raft/uv_fs.c | 4 ++++ src/raft/uv_os.c | 2 +- src/tracing.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/raft/uv_fs.c b/src/raft/uv_fs.c index de380d21d..b3cebd3e3 100644 --- a/src/raft/uv_fs.c +++ b/src/raft/uv_fs.c @@ -712,6 +712,10 @@ static int probeDirectIO(int fd, size_t *size, char *errmsg) ErrMsgPrintf(errmsg, "unsupported file system: %ux", fs_info.f_type); +#elif defined(__x86_64__) && defined(__ILP32__) + ErrMsgPrintf(errmsg, + "unsupported file system: %llx", + fs_info.f_type); #else ErrMsgPrintf(errmsg, "unsupported file system: %zx", diff --git a/src/raft/uv_os.c b/src/raft/uv_os.c index 8a96ab130..a8a972210 100644 --- a/src/raft/uv_os.c +++ b/src/raft/uv_os.c @@ -52,7 +52,7 @@ int UvOsFallocateEmulation(int fd, off_t offset, off_t len) if (f.f_bsize == 0) { increment = 512; } else if (f.f_bsize < 4096) { - increment = f.f_bsize; + increment = (ssize_t)f.f_bsize; } else { increment = 4096; } diff --git a/src/tracing.c b/src/tracing.c index 96c148e28..0314a54fe 100644 --- a/src/tracing.c +++ b/src/tracing.c @@ -79,7 +79,7 @@ static inline void tracerEmit(const char *file, tracerPidCached, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, - tm.tm_min, tm.tm_sec, ts.tv_nsec, + tm.tm_min, tm.tm_sec, (unsigned long)ts.tv_nsec, (unsigned)tid, tracerTraceLevelName(level), func, tracerShortFileName(file), line, message);