51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 1e053c698b7ff8f7b4cc3c7c6e9945b72c3d5286 Mon Sep 17 00:00:00 2001
|
||
From: Sebastian Pipping <sebastian@pipping.org>
|
||
Date: Tue, 20 Apr 2021 19:01:30 +0200
|
||
Subject: [PATCH] Autotools|CMake: Suppress -Wpedantic-ms-format false
|
||
positives
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Addresses warning:
|
||
ISO C does not support the ‘I64’ ms_printf length modifier.
|
||
|
||
It seems correct and relevant with __USE_MINGW_ANSI_STDIO, only.
|
||
And -Werror doesn't tolerate false positives...
|
||
---
|
||
CMakeLists.txt | 4 ++++
|
||
configure.ac | 2 +-
|
||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
index 951df0e..96ac5da 100644
|
||
--- a/CMakeLists.txt
|
||
+++ b/CMakeLists.txt
|
||
@@ -248,6 +248,10 @@ if(FLAG_VISIBILITY)
|
||
add_definitions(-DXML_ENABLE_VISIBILITY=1)
|
||
set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -fvisibility=hidden")
|
||
endif(FLAG_VISIBILITY)
|
||
+if(MINGW)
|
||
+ # Without __USE_MINGW_ANSI_STDIO the compiler produces a false positive
|
||
+ set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -Wno-pedantic-ms-format")
|
||
+endif()
|
||
if (EXPAT_WARNINGS_AS_ERRORS)
|
||
if(MSVC)
|
||
add_definitions(/WX)
|
||
diff --git a/configure.ac b/configure.ac
|
||
index f26ce6c..7d60a2c 100644
|
||
--- a/configure.ac
|
||
+++ b/configure.ac
|
||
@@ -111,7 +111,7 @@ AS_IF([test "$GCC" = yes],
|
||
AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes], [CFLAGS])
|
||
AX_APPEND_COMPILE_FLAGS([-pedantic -Wduplicated-cond -Wduplicated-branches -Wlogical-op], [CFLAGS])
|
||
AX_APPEND_COMPILE_FLAGS([-Wrestrict -Wnull-dereference -Wjump-misses-init -Wdouble-promotion], [CFLAGS])
|
||
- AX_APPEND_COMPILE_FLAGS([-Wshadow -Wformat=2 -Wmisleading-indentation], [CFLAGS])])
|
||
+ AX_APPEND_COMPILE_FLAGS([-Wshadow -Wformat=2 -Wno-pedantic-ms-format -Wmisleading-indentation], [CFLAGS])])
|
||
|
||
AC_LANG_PUSH([C++])
|
||
AC_PROG_CXX
|
||
--
|
||
1.8.3.1
|
||
|