[gtkmm/gtkmm-3-24] g[d|t]kmmconfig.h.*: Don't dllimport on MinGW



commit 47c17ef5718e1afe45b7009471027053e3a4150d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Mar 9 08:16:29 2021 +0000

    g[d|t]kmmconfig.h.*: Don't dllimport on MinGW
    
    This will fix warnings when building items using gdkmm and gtkmm with
    MinGW/GCC.
    
    Fixes: https://gitlab.gnome.org/GNOME/gtkmm/-/issues/90
    
    
    (cherry picked from commit 86685b604692b5d93f51a1d886786352c921dc51)

 gdk/gdkmmconfig.h.in    | 4 +++-
 gdk/gdkmmconfig.h.meson | 4 +++-
 gtk/gtkmmconfig.h.in    | 4 +++-
 gtk/gtkmmconfig.h.meson | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/gdk/gdkmmconfig.h.in b/gdk/gdkmmconfig.h.in
index b98f283d..0393b8ae 100644
--- a/gdk/gdkmmconfig.h.in
+++ b/gdk/gdkmmconfig.h.in
@@ -27,8 +27,10 @@
 #ifdef GDKMM_DLL
 # ifdef GDKMM_BUILD
 #  define GDKMM_API __declspec(dllexport)
-# else
+# elif !defined (__GNUC__)
 #  define GDKMM_API __declspec(dllimport)
+# else /* don't dllimport classes/methods on GCC/MinGW */
+#  define GDKMM_API
 # endif /* GDKMM_BUILD */
 #else
 /* Build a static library or a non-native-Windows library */
diff --git a/gdk/gdkmmconfig.h.meson b/gdk/gdkmmconfig.h.meson
index 19335e73..dde7944b 100644
--- a/gdk/gdkmmconfig.h.meson
+++ b/gdk/gdkmmconfig.h.meson
@@ -27,8 +27,10 @@
 #ifdef GDKMM_DLL
 # ifdef GDKMM_BUILD
 #  define GDKMM_API __declspec(dllexport)
-# else
+# elif !defined (__GNUC__)
 #  define GDKMM_API __declspec(dllimport)
+# else /* don't dllimport classes/methods on GCC/MinGW */
+#  define GDKMM_API
 # endif /* GDKMM_BUILD */
 #else
 /* Build a static library or a non-native-Windows library */
diff --git a/gtk/gtkmmconfig.h.in b/gtk/gtkmmconfig.h.in
index 9fff6c9f..3fa76b80 100644
--- a/gtk/gtkmmconfig.h.in
+++ b/gtk/gtkmmconfig.h.in
@@ -30,8 +30,10 @@
 #ifdef GTKMM_DLL
 # if defined(GTKMM_BUILD)
 #  define GTKMM_API __declspec(dllexport)
-# else
+# elif !defined (__GNUC__)
 #  define GTKMM_API __declspec(dllimport)
+# else /* don't dllimport classes/methods on GCC/MinGW */
+#  define GTKMM_API
 # endif
 #else
 /* Build a static library or a non-native Windows library or gendef is used. */
diff --git a/gtk/gtkmmconfig.h.meson b/gtk/gtkmmconfig.h.meson
index c7e92dd0..39285d4a 100644
--- a/gtk/gtkmmconfig.h.meson
+++ b/gtk/gtkmmconfig.h.meson
@@ -30,8 +30,10 @@
 #ifdef GTKMM_DLL
 # if defined(GTKMM_BUILD)
 #  define GTKMM_API __declspec(dllexport)
-# else
+# elif !defined (__GNUC__)
 #  define GTKMM_API __declspec(dllimport)
+# else /* don't dllimport classes/methods on GCC/MinGW */
+#  define GTKMM_API
 # endif
 #else
 /* Build a static library or a non-native Windows library or gendef is used. */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]