Merge tag 'upstream/3.3.2'

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

diff --git a/common-src/amflock.c b/common-src/amflock.c
index 858c2885594a4403b948669f8c3d0b42df84f552..20fad47868cf605dc9680dae553b3704d4309473 100644 (file)
--- a/common-src/amflock.c
+++ b/common-src/amflock.c
@@ -36,7 +36,14 @@
  * New Implementation
  */
 
-static GStaticMutex lock_lock = 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 lock_lock = G_STATIC_MUTEX_INIT;
+# pragma GCC diagnostic pop
+#else
+  static GStaticMutex lock_lock = G_STATIC_MUTEX_INIT;
+#endif
 static GHashTable *locally_locked_files = NULL;
 static int lock_rw_rd(file_lock *lock, short l_type);