From d6fb7a2c36f8a6d5fac4754cdfdb5483a03f2892 Mon Sep 17 00:00:00 2001
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
Date: Sat, 26 Aug 2023 13:37:47 +0300
Subject: win32: UCRT: avoid I64 printf format warnings

Builds without warnings on:
mingw-msvcrt gcc 13.2      i686/x86-64 (w64devkit).
mingw-ucrt   gcc 13.1/13.2 i686/x86-64 (winlibs).

Where previously both the ucrt builds warned about I64.
---
 include/libbb.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/libbb.h b/include/libbb.h
index 61c75791c..e3b17655c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -288,7 +288,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 	: ((T)1 << (sizeof(T)*8-1)) \
 	)
 
-#if ENABLE_PLATFORM_MINGW32 && \
+// UCRT supports both "ll" and "I64", but gcc warns on "I64" with UCRT mingw
+#if ENABLE_PLATFORM_MINGW32 && !defined(_UCRT) && \
 	(!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO)
 #define LL_FMT "I64"
 #else
@@ -296,7 +297,7 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 #endif
 
 #if ENABLE_PLATFORM_MINGW32 && defined(_WIN64)
-#define PID_FMT "I64"
+#define PID_FMT LL_FMT
 #else
 #define PID_FMT
 #endif
-- 
cgit v1.2.3-55-g6feb