From daf362ee61170727be0ca5dec1cf39435485ad0c Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 25 Feb 2022 16:06:59 +0000 Subject: [PATCH] build: Opt out from using mingw-w64's replacement printf(), etc. The Windows code in dbus is careful to use Windows-specific equivalents of the Standard C features that are not implemented by msvcrt.dll, so we don't need to substitute a Standard C printf implementation. This avoids compiler warnings/errors when gcc expects us to be using Microsoft printf syntax (`ms_printf` attribute), but newer versions of mingw-w64 expect us to be using GNU or Standard C printf syntax (`gnu_printf` attribute) as a result of `__USE_MINGW_ANSI_STDIO` being enabled by default if not otherwise specified. Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/380 Signed-off-by: Simon McVittie --- cmake/config.h.cmake | 9 +++++++++ configure.ac | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 34592372d..4215a9036 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -6,6 +6,14 @@ /* indicate that we are building with cmake */ #define DBUS_CMAKE 1 +/* On Windows, we expect to be using msvcrt.dll-compatible printf + * (%I64u instead of %llu) unless otherwise specified. This must be + * done near the beginning of config.h, before we have included any + * system headers that might check the value of this macro. */ +#ifndef __USE_MINGW_ANSI_STDIO +# define __USE_MINGW_ANSI_STDIO 0 +#endif + @AUTOPACKAGE_CONFIG_H_TEMPLATE@ /* @@ -317,4 +325,5 @@ #cmakedefine01 HAVE_DECL_ENVIRON #cmakedefine01 HAVE_DECL_LOG_PERROR #cmakedefine01 HAVE_DECL_MSG_NOSIGNAL + #endif // _DBUS_CONFIG_H diff --git a/configure.ac b/configure.ac index 78f715b50..eb2314f2d 100644 --- a/configure.ac +++ b/configure.ac @@ -1694,6 +1694,15 @@ AH_VERBATIM(_DARWIN_ENVIRON, #endif ]) +AH_VERBATIM([USE_MINGW_ANSI_STDIO], +[ +/* On Windows, we expect to be using msvcrt.dll-compatible printf + * (%I64u instead of %llu) unless otherwise specified */ +#ifndef __USE_MINGW_ANSI_STDIO +# define __USE_MINGW_ANSI_STDIO 0 +#endif +]) + AC_ARG_ENABLE([stats], [AS_HELP_STRING([--disable-stats], [disable bus daemon usage statistics])], -- 2.47.3