From: Vincent Fu <vincent.fu@samsung.com>
Date: Fri, 28 Jun 2024 22:12:09 +0000 (-0400)
Subject: windows: don't define strtoll for 32-bit builds
X-Git-Tag: fio-3.38~49
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6eaa6422fccf857e6b1a88492db805dafca8ee85;p=fio.git

windows: don't define strtoll for 32-bit builds

Our 32-bit Windows Cygwin builds started failing because one of the
libraries they require now defines strtoll when fio already defines
strtoll. To avoid this, don't define strtoll for 32-bit Windows builds.

Failed build: https://github.com/axboe/fio/actions/runs/9718276970/job/26825784199

Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
---

diff --git a/os/windows/posix.c b/os/windows/posix.c
index a47223da..2ce18b8b 100644
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -873,10 +873,12 @@ ssize_t writev(int fildes, const struct iovec *iov, int iovcnt)
 	return bytes_written;
 }
 
+#ifndef _WIN32
 long long strtoll(const char *restrict str, char **restrict endptr, int base)
 {
 	return _strtoi64(str, endptr, base);
 }
+#endif
 
 int poll(struct pollfd fds[], nfds_t nfds, int timeout)
 {