From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Wed, 21 Jun 2023 04:24:40 +0000 (+0800)
Subject: Visual Studio: Remove workarounds for <= glib-2.74.x
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~116^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4e9bd13892da1bc441c47ef94476f278dbb85ddb;p=gtk4.git

Visual Studio: Remove workarounds for <= glib-2.74.x

We now need glib-2.76.0 or later, which removes our needs for the workarounds
that we need to build the media backends against GLib-2.74.x or earlier, so
clean up things a bit.
---

diff --git a/meson.build b/meson.build
index 69db95198f..2959a8dbfe 100644
--- a/meson.build
+++ b/meson.build
@@ -365,13 +365,6 @@ glib_dep       = dependency('glib-2.0', version: glib_req)
 gobject_dep    = dependency('gobject-2.0', version: glib_req)
 if os_win32
   giowin32_dep = dependency('gio-windows-2.0', version: glib_req, required: win32_enabled)
-  if giowin32_dep.version().version_compare('<2.75.0')
-    if cc.get_id() == 'msvc' and get_option('default_library') != 'static'
-      # Override _GLIB_EXTERN on Visual Studio for media modules for glib <= 2.74.x, so that we
-      # avoid error C2375 (redefinition; different linkage) when building the g_io_module_*() bits
-      cdata.set('MODULES_OVERRIDE_GLIB_EXTERN', true)
-    endif
-  endif
 endif
 if os_unix
   giounix_dep  = dependency('gio-unix-2.0', version: glib_req, required: false)
diff --git a/modules/media/gtkffmediafile.c b/modules/media/gtkffmediafile.c
index 0103e5bd16..2839cb8174 100644
--- a/modules/media/gtkffmediafile.c
+++ b/modules/media/gtkffmediafile.c
@@ -19,15 +19,6 @@
 
 #include "config.h"
 
-/*
- * Sadly, we need this to build on Visual Studio against glib-2.74.x or earlier,
- * otherwise the build will fail when building the g_io_module_*() bits with error C2375
- * (redefinition; different linkage).  This must be before including the Gio headers.
- */
-#if defined (_MSC_VER) && defined (MODULES_OVERRIDE_GLIB_EXTERN)
-# define _GLIB_EXTERN __declspec(dllexport) extern
-#endif
-
 #include "gtkffmediafileprivate.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/modules/media/gtkgstmediafile.c b/modules/media/gtkgstmediafile.c
index 7353539ef6..5487bb0571 100644
--- a/modules/media/gtkgstmediafile.c
+++ b/modules/media/gtkgstmediafile.c
@@ -19,15 +19,6 @@
 
 #include "config.h"
 
-/*
- * Sadly, we need this to build on Visual Studio against glib-2.74.x or earlier,
- * otherwise the build will fail when building the g_io_module_*() bits with error C2375
- * (redefinition; different linkage).  This must be before including the Gio headers.
- */
-#if defined (_MSC_VER) && defined (MODULES_OVERRIDE_GLIB_EXTERN)
-# define _GLIB_EXTERN __declspec(dllexport) extern
-#endif
-
 #include "gtkgstmediafileprivate.h"
 #include "gtkgstpaintableprivate.h"