AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'build-fix-glib-2.66' into 'main'

Browse Source 
build: fix for use with glib 2.66.0 (2nd try)

See merge request GNOME/gtk!4932
This commit is contained in:
Matthias Clasen 2022-08-07 19:09:04 +00:00
commit 73f634435a
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/broadway/gdksurface-broadway.c
View File

@ -47,6 +47,10 @@
#include <stdio.h>
#include <string.h>
#if !GLIB_CHECK_VERSION (2, 67, 3)
# define g_memdup2(mem,size) g_memdup((mem), (size))
#endif
/* Forward declarations */
static void gdk_broadway_surface_finalize (GObject *object);

18
testsuite/reftests/gtk-reftest.c
View File

@ -62,6 +62,22 @@ static const GOptionEntry test_args[] = {
static gboolean using_tap;
/* A simplified version of g_log_writer_default_would_drop(), to avoid
* bumping up the required version of GLib to 2.68
*/
static gboolean
would_drop (GLogLevelFlags level,
const char *domain)
{
#if GLIB_CHECK_VERSION (2, 68, 0)
return g_log_writer_default_would_drop (level, domain);
#else
return (level & (G_LOG_LEVEL_ERROR |
G_LOG_LEVEL_CRITICAL |
G_LOG_LEVEL_WARNING)) == 0;
#endif
}
static gboolean
parse_command_line (int *argc, char ***argv)
{
@ -497,7 +513,7 @@ log_writer (GLogLevelFlags log_level,
}
#endif
if (!g_log_writer_default_would_drop (log_level, NULL))
if (!would_drop (log_level, NULL))
return g_log_writer_standard_streams (log_level, fields, n_fields, user_data);
return G_LOG_WRITER_HANDLED;