From 752122b2e9647b82fbb7f6eac120d57b913761f9 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Sat, 14 Mar 2020 16:43:08 +0200 Subject: [PATCH] Try fixing Windows build to work with ALL_BUGS_ARE_FATAL --- src/feature/dircache/conscache.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/feature/dircache/conscache.c b/src/feature/dircache/conscache.c index ceba410a5f..d9aaccddc1 100644 --- a/src/feature/dircache/conscache.c +++ b/src/feature/dircache/conscache.c @@ -132,6 +132,15 @@ consensus_cache_may_overallocate(consensus_cache_t *cache) #endif } +// HACK: GCC on Appveyor hates that we may assert before returning. Work around +// the error. +#ifdef _WIN32 +#ifndef COCCI +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn" +#endif +#endif + /** * Tell the sandbox (if any) configured by cfg to allow the * operations that cache will need. @@ -156,6 +165,12 @@ consensus_cache_register_with_sandbox(consensus_cache_t *cache, return storage_dir_register_with_sandbox(cache->dir, cfg); } +#ifdef _WIN32 +#ifndef COCCI +#pragma GCC diagnostic pop +#endif +#endif + /** * Helper: clear all entries from cache (but do not delete * any that aren't marked for removal