diff options
| -rw-r--r-- | crossmingw32-glib2.spec | 2 | ||||
| -rw-r--r-- | glib2-win32.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec index ba69c34..b438181 100644 --- a/crossmingw32-glib2.spec +++ b/crossmingw32-glib2.spec @@ -13,7 +13,7 @@ Summary(zh_CN.UTF-8): 实用工具函数库 %define realname glib Name: crossmingw32-glib2 Version: 2.58.3 -Release: 1 +Release: 2 License: LGPL v2+ Group: Development/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.58/glib-%{version}.tar.xz diff --git a/glib2-win32.patch b/glib2-win32.patch index 6912d5f..09d2779 100644 --- a/glib2-win32.patch +++ b/glib2-win32.patch @@ -109,3 +109,14 @@ #include <iphlpapi.h> #include <stdio.h> +--- glib-2.58.3/glib/gutils.h.orig 2019-01-21 14:38:50.000000000 +0100 ++++ glib-2.58.3/glib/gutils.h 2019-01-31 18:01:41.630885345 +0100 +@@ -214,7 +214,7 @@ + * wants the function to be called when it *itself* exits (or is + * detached, in case the caller, too, is a DLL). + */ +-#if (defined(__MINGW_H) && !defined(_STDLIB_H_)) || (defined(_MSC_VER) && !defined(_INC_STDLIB)) ++#if (defined(__MINGW_H) && !defined(_STDLIB_H_) && !defined(_STDLIB_H)) || (defined(_MSC_VER) && !defined(_INC_STDLIB)) + int atexit (void (*)(void)); + #endif + #define g_atexit(func) atexit(func) |