Mercurial > mxe-octave

view src/glib-2-fixes.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 552fca54749c
children
line wrap: on
line source

See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1428

--- a/glib/gtypes.h	2016-10-22 07:21:52.000000000 +0200
+++ b/glib/gtypes.h	2020-05-17 11:13:49.369639688 +0200
@@ -522,7 +522,7 @@
 #    else /* !GLIB_STATIC_COMPILATION */
 #      ifdef GLIB_COMPILATION
 #        ifdef DLL_EXPORT
-#          define GLIB_VAR __declspec(dllexport)
+#          define GLIB_VAR extern __declspec(dllexport)
 #        else /* !DLL_EXPORT */
 #          define GLIB_VAR extern
 #        endif /* !DLL_EXPORT */
--- a/gobject/gparamspecs.h	2016-10-22 07:22:21.000000000 +0200
+++ b/gobject/gparamspecs.h	2020-05-17 11:16:37.803281391 +0200
@@ -1144,7 +1144,7 @@
 #    else /* !GOBJECT_STATIC_COMPILATION */
 #      ifdef GOBJECT_COMPILATION
 #        ifdef DLL_EXPORT
-#          define GOBJECT_VAR __declspec(dllexport)
+#          define GOBJECT_VAR extern __declspec(dllexport)
 #        else /* !DLL_EXPORT */
 #          define GOBJECT_VAR extern
 #        endif /* !DLL_EXPORT */