summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-26 23:52:23 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-27 00:01:41 +0200
commit7555175e605aab5567020ce48b00bfa6f4d2b726 (patch)
treea40f4fa67e2d6d2f0f20572a92317c18a0c2d0c9 /src
parent16d50c8309bad5547bd07a3a6e78b404d490d93d (diff)
Hide some windows warnings.
Diffstat (limited to 'src')
-rw-r--r--src/lib/util.cc2
-rw-r--r--src/lib/warnings.h1
2 files changed, 3 insertions, 0 deletions
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 \