From 7555175e605aab5567020ce48b00bfa6f4d2b726 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 26 Jul 2020 23:52:23 +0200 Subject: [PATCH] Hide some windows warnings. --- src/lib/util.cc | 2 ++ src/lib/warnings.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/lib/util.cc b/src/lib/util.cc index b6ca34d22..7ba9242fa 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -233,6 +233,7 @@ addr2line (void const * const addr) return system(addr2line_cmd); } +DCPOMATIC_DISABLE_WARNINGS /** This is called when C signals occur on Windows (e.g. SIGSEGV) * (NOT C++ exceptions!). We write a backtrace to backtrace_file by dark means. * Adapted from code here: http://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c/ @@ -289,6 +290,7 @@ exception_handler(struct _EXCEPTION_POINTERS * info) return EXCEPTION_CONTINUE_SEARCH; } +DCPOMATIC_ENABLE_WARNINGS #endif void diff --git a/src/lib/warnings.h b/src/lib/warnings.h index bfb666e1b..4414755f5 100644 --- a/src/lib/warnings.h +++ b/src/lib/warnings.h @@ -21,6 +21,7 @@ #define DCPOMATIC_DISABLE_WARNINGS \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ + _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \ _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") #define DCPOMATIC_ENABLE_WARNINGS \ -- 2.30.2