tor-browser

commit 081289856ab1b9aa0810a8e7a770a412fe8634bd
parent d234dc93b02777e27e7540c985548a6f3efa8ac8
Author: Chris Peterson <cpeterson@mozilla.com>
Date:   Wed,  1 Oct 2025 03:14:02 +0000

Bug 1990740 - Suppress C++20 -Wdeprecated-volatile and -Wvolatile warnings from GLib's G_DEFINE_TYPE macro. r=stransky

These warnings were fixed in GLib 2.67.1, so suppress these warnings when building with GLib versions < 2.67.1.

https://gitlab.gnome.org/GNOME/glib/-/issues/600

Differential Revision: https://phabricator.services.mozilla.com/D266119

Diffstat:
M
toolkit/system/gnome/nsGIOService.cpp
 | 
24
++++++++++++++++++++++++

1 file changed, 24 insertions(+), 0 deletions(-)
diff --git a/toolkit/system/gnome/nsGIOService.cpp b/toolkit/system/gnome/nsGIOService.cpp
@@ -23,6 +23,7 @@
 #include "prenv.h"
 
 #include <gio/gio.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <gio/gdesktopappinfo.h>
 #ifdef MOZ_ENABLE_DBUS
@@ -66,9 +67,32 @@ typedef struct {
 typedef struct {
   GAppLaunchContextClass parent_class;
 } MozAppLaunchContextClass;
+
+// GLib's G_DEFINE_TYPE triggers warnings about volatile types. These warnings
+// were fixed in GLib 2.67.1: https://gitlab.gnome.org/GNOME/glib/-/issues/600
+// We can remove the diagnostic pragmas below after our minimum supported GLib
+// version is >= 2.67.1.
+#if !GLIB_CHECK_VERSION(2, 67, 1)
+#  if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#  elif defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wvolatile"
+#  endif
+#endif
+
 G_DEFINE_TYPE(MozAppLaunchContext, moz_app_launch_context,
               G_TYPE_APP_LAUNCH_CONTEXT)
 
+#if !GLIB_CHECK_VERSION(2, 67, 1)
+#  if defined(__clang__)
+#    pragma clang diagnostic pop
+#  elif defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#  endif
+#endif
+
 static char* moz_app_launch_context_get_startup_notify_id(
     GAppLaunchContext* context, GAppInfo* info, GList* files) {
   MozAppLaunchContext* self = MOZ_APP_LAUNCH_CONTEXT(context);