Imported Upstream version 3.3.2

[debian/amanda] / common-src / match.c

diff --git a/common-src/match.c b/common-src/match.c
index 0981a43f74484a3e7c7a8e1357a80f26a8452454..cd363e45877ca5e399040ad7d7744284de8fa7cb 100644 (file)
--- a/common-src/match.c
+++ b/common-src/match.c
@@ -153,7 +153,14 @@ static struct mword_regexes mword_slash_regexes = {
  * be called from within threads, so play it safe.
  */
 
-static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
+#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 31))
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+  static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
+# pragma GCC diagnostic pop
+#else
+  static GStaticMutex re_cache_mutex = G_STATIC_MUTEX_INIT;
+#endif
 static GHashTable *regex_cache = NULL, *regex_cache_newline = NULL;
 
 /*