Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit 72bcaffd7d56d4c2ebad6d0a1e465e0e9db8be40:

  Fio 3.33 (2022-11-06 13:55:41 -0700)

are available in the Git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 2d92b09513b3c11a04541298aece35eae3dbc963:

  Merge branch 'master' of https://github.com/bvanassche/fio (2022-11-07 16:20:04 -0700)

----------------------------------------------------------------
Bart Van Assche (2):
      Windows: Fix the build
      Android: Enable zoned block device support

Jens Axboe (1):
      Merge branch 'master' of https://github.com/bvanassche/fio

 configure                         |  2 +-
 os/windows/dlls.c                 | 16 +++++++++++-----
 os/windows/posix/include/syslog.h |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

---

Diff of recent changes:

diff --git a/configure b/configure
index 24c599a8..30bf5acb 100755
--- a/configure
+++ b/configure
@@ -2561,7 +2561,7 @@ if compile_prog "" "" "valgrind_dev"; then
 fi
 print_config "Valgrind headers" "$valgrind_dev"
 
-if test "$targetos" = "Linux" ; then
+if test "$targetos" = "Linux" || test "$targetos" = "Android"; then
 ##########################################
 # <linux/blkzoned.h> probe
 if test "$linux_blkzoned" != "yes" ; then
diff --git a/os/windows/dlls.c b/os/windows/dlls.c
index 774b1c61..ffedfa1e 100644
--- a/os/windows/dlls.c
+++ b/os/windows/dlls.c
@@ -11,12 +11,18 @@ void os_clk_tck(long *clk_tck)
 	 */
 	unsigned long minRes, maxRes, curRes;
 	HMODULE lib;
-	FARPROC queryTimer;
-	FARPROC setTimer;
+	NTSTATUS NTAPI (*queryTimer)
+		(OUT PULONG              MinimumResolution,
+		 OUT PULONG              MaximumResolution,
+		 OUT PULONG              CurrentResolution);
+	NTSTATUS NTAPI (*setTimer)
+		(IN ULONG                DesiredResolution,
+		 IN BOOLEAN              SetResolution,
+		 OUT PULONG              CurrentResolution);
 
 	if (!(lib = LoadLibrary(TEXT("ntdll.dll"))) ||
-		!(queryTimer = GetProcAddress(lib, "NtQueryTimerResolution")) ||
-		!(setTimer = GetProcAddress(lib, "NtSetTimerResolution"))) {
+		!(queryTimer = (void *)GetProcAddress(lib, "NtQueryTimerResolution")) ||
+		!(setTimer = (void *)GetProcAddress(lib, "NtSetTimerResolution"))) {
 		dprint(FD_HELPERTHREAD, 
 			"Failed to load ntdll library, set to lower bound 64 Hz\n");
 		*clk_tck = 64;
@@ -30,4 +36,4 @@ void os_clk_tck(long *clk_tck)
 		setTimer(maxRes, 1, &curRes);
 		*clk_tck = (long) (10000000L / maxRes);
 	}
-}
\ No newline at end of file
+}
diff --git a/os/windows/posix/include/syslog.h b/os/windows/posix/include/syslog.h
index b8582e95..03a04f69 100644
--- a/os/windows/posix/include/syslog.h
+++ b/os/windows/posix/include/syslog.h
@@ -1,7 +1,7 @@
 #ifndef SYSLOG_H
 #define SYSLOG_H
 
-int syslog();
+int syslog(int priority, const char *format, ...);
 
 #define LOG_INFO	0x1
 #define LOG_ERROR	0x2