From a67b115699664d6ac62e2badb276e38149877a80 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sun, 23 Feb 2025 02:46:20 +0000 Subject: [PATCH] ioprio: Standardise HAVE_WINDOWS_IOPRIO macro as defined with either 0 or 1 --- configure.ac | 10 +++++----- src/util/ioprio.cpp | 2 +- src/util/ioprio.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 35f8d7c56c398a..8840cbf782fc2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1157,13 +1157,13 @@ AC_COMPILE_IFELSE([ SetFileInformationByHandle(hFile, FileIoPriorityHintInfo, &priorityHint, sizeof(priorityHint)); ]]) ],[ - have_windows_ioprio=yes - AC_DEFINE(HAVE_WINDOWS_IOPRIO,1,[Define this symbol if you have Windows I/O priority functions]) + AC_MSG_RESULT([yes]) + HAVE_WINDOWS_IOPRIO=1 ],[ - have_windows_ioprio=no + AC_MSG_RESULT([no]) + HAVE_WINDOWS_IOPRIO=0 ]) -AC_MSG_RESULT($have_windows_ioprio) -AM_CONDITIONAL([HAVE_WINDOWS_IOPRIO], [test "$have_windows_ioprio" = "yes"]) +AC_DEFINE_UNQUOTED([HAVE_WINDOWS_IOPRIO], [$HAVE_WINDOWS_IOPRIO], [Define to 1 if Windows file IO functions are usable.]) dnl Check for different ways of gathering OS randomness AC_MSG_CHECKING([for Linux getrandom function]) diff --git a/src/util/ioprio.cpp b/src/util/ioprio.cpp index 382b42f6e52fe4..36997cdc6bce4e 100644 --- a/src/util/ioprio.cpp +++ b/src/util/ioprio.cpp @@ -57,7 +57,7 @@ int ioprio_set_idle() { #endif -#ifdef HAVE_WINDOWS_IOPRIO +#if HAVE_WINDOWS_IOPRIO #ifdef _WIN32_WINNT #undef _WIN32_WINNT diff --git a/src/util/ioprio.h b/src/util/ioprio.h index 2c1bc04d8ba753..1496f59da5b5be 100644 --- a/src/util/ioprio.h +++ b/src/util/ioprio.h @@ -54,7 +54,7 @@ class ioprio_idler { #define IOPRIO_IDLER(lowprio) (void)lowprio; #endif -#ifdef HAVE_WINDOWS_IOPRIO +#if HAVE_WINDOWS_IOPRIO bool ioprio_set_file_idle(FILE *); #else #define ioprio_set_file_idle(f) ((void)false)