mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4053_glib_2_63_3'

Browse Source 
* 4053_glib_2_63_3:
  Ticket #4053: fix FTBFS with glib2 >= 2.63.3.
This commit is contained in:
Andrew Borodin 2020-01-24 21:25:05 +03:00
commit 23b906a4aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/glibcompat.c
View File

@ -91,7 +91,7 @@ g_list_free_full (GList * list, GDestroyNotify free_func)
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
#if ! GLIB_CHECK_VERSION (2, 64, 0)
#if ! GLIB_CHECK_VERSION (2, 63, 3)
/**
* g_clear_slist: (skip)
* @slist_ptr: (not nullable): a #GSList return location
@ -154,7 +154,7 @@ g_clear_list (GList ** list_ptr, GDestroyNotify destroy)
/* --------------------------------------------------------------------------------------------- */
#endif /* ! GLIB_CHECK_VERSION (2, 64, 0) */
#endif /* ! GLIB_CHECK_VERSION (2, 63, 3) */
#if ! GLIB_CHECK_VERSION (2, 32, 0)
/**

4
lib/glibcompat.h
View File

@ -16,10 +16,10 @@ void g_slist_free_full (GSList * list, GDestroyNotify free_func);
void g_list_free_full (GList * list, GDestroyNotify free_func);
#endif /* ! GLIB_CHECK_VERSION (2, 28, 0) */
#if ! GLIB_CHECK_VERSION (2, 64, 0)
#if ! GLIB_CHECK_VERSION (2, 63, 3)
void g_clear_slist (GSList ** slist_ptr, GDestroyNotify destroy);
void g_clear_list (GList ** list_ptr, GDestroyNotify destroy);
#endif /* ! GLIB_CHECK_VERSION (2, 64, 0) */
#endif /* ! GLIB_CHECK_VERSION (2, 63, 3) */
#if ! GLIB_CHECK_VERSION (2, 32, 0)
void g_queue_free_full (GQueue * queue, GDestroyNotify free_func);