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

build: fix for use with glib 2.66.0

Browse Source 
Add missing #define g_memdup2() for gdksurface-broadway.c in case of enabled
broadway-backend as used otherwise.

Copy static would_drop() replacement for g_log_writer_default_would_drop()
from gtk-builder-tool.c to gtk-reftest.c
This commit is contained in:
Hannes Müller 2022-08-05 13:35:06 +02:00
parent af6432aa67
commit 703fc51d8e
2 changed files with 17 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);

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

@ -62,6 +62,18 @@ 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)
{
return (level & (G_LOG_LEVEL_ERROR |
G_LOG_LEVEL_CRITICAL |
G_LOG_LEVEL_WARNING)) == 0;
}
static gboolean
parse_command_line (int *argc, char ***argv)
{
@ -497,7 +509,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;