From 0dad501d16489f41a3b33f25f6d4024fd1cb3cb7 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 3 May 2017 16:22:52 +0100
Subject: [PATCH] meson: Remove G_LOG_USE_STRUCTURED from target C flags

The G_LOG_USE_STRUCTURED symbol is defined in the project flags, so we
don't need to add it again in the per-target flags.
---
 gdk/broadway/meson.build | 3 +--
 gdk/meson.build          | 1 -
 gdk/wayland/meson.build  | 1 -
 gdk/x11/meson.build      | 1 -
 gtk/meson.build          | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
index d1bb273c98..10bec6779c 100644
--- a/gdk/broadway/meson.build
+++ b/gdk/broadway/meson.build
@@ -38,7 +38,6 @@ libgdk_broadway = static_library('gdk-broadway',
   c_args: [
     '-DGDK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
-    '-DG_LOG_USE_STRUCTURED=1',
   ] + common_cflags,
   link_args: common_ldflags,
   dependencies: [gdk_deps, gdk_broadway_deps])
@@ -63,6 +62,6 @@ executable('gtk4-broadwayd',
   clienthtml_h, broadwayjs_h,
   'broadwayd.c', 'broadway-server.c', 'broadway-buffer.c', 'broadway-output.c',
   include_directories: [confinc, gdkinc],
-  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', '-DG_LOG_USE_STRUCTURED=1', ],
+  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
   dependencies : [broadwayd_syslib, gdk_deps],
   install : true)
diff --git a/gdk/meson.build b/gdk/meson.build
index 8cd144e937..143f20db46 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -205,7 +205,6 @@ libgdk = static_library('gdk',
   c_args: [
     '-DGDK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
-    '-DG_LOG_USE_STRUCTURED=1',
   ] + common_cflags,
   link_whole: gdk_backends,
   link_args: common_ldflags)
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 1753ef9050..fe103df26e 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -98,7 +98,6 @@ libgdk_wayland = static_library('gdk-wayland',
                                 c_args: [
                                   '-DGDK_COMPILATION',
                                   '-DG_LOG_DOMAIN="Gdk"',
-                                  '-DG_LOG_USE_STRUCTURED=1',
                                 ] + common_cflags,
                                 link_args: common_ldflags,
                                 dependencies: [ gdk_deps, gdk_wayland_deps, ])
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 5cc6e98d39..28f0428528 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -73,7 +73,6 @@ libgdk_x11 = static_library('gdk-x11',
                             c_args: [
                               '-DGDK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gdk"',
-                              '-DG_LOG_USE_STRUCTURED=1',
                             ] + common_cflags,
                             link_args: common_ldflags,
                             dependencies: [ gdk_deps, gdk_x11_deps, ])
diff --git a/gtk/meson.build b/gtk/meson.build
index 40a452cafe..b278ff6026 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -771,7 +771,6 @@ gtkversion = configure_file(input: 'gtkversion.h.in',
 gtk_cargs = [
   '-DGTK_COMPILATION',
   '-DG_LOG_DOMAIN="Gtk"',
-  '-DG_LOG_USE_STRUCTURED=1',
   '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
   '-DGTK_BINARY_VERSION="@0@"'.format(gtk_binary_version),
   '-DGTK_HOST="@0@"'.format(host_machine.system()),