From 1f5983bc7b33d25cf7e37bc2546fc73b0f02c98e Mon Sep 17 00:00:00 2001 From: Philippe Normand Date: Thu, 25 Nov 2010 10:32:45 +0100 Subject: [PATCH] 2010-11-25 Philippe Normand Rubber-stamped by Xan Lopez. g_signal_accumulator_first_wins was introduced in glib 2.27.1 so no need to use our version if that version of glib is used during the build. * platform/gtk/GtkVersioning.c: * platform/gtk/GtkVersioning.h: --- WebCore/ChangeLog | 11 +++++++++++ WebCore/platform/gtk/GtkVersioning.c | 2 +- WebCore/platform/gtk/GtkVersioning.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 1e737dc..f0981a0 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2010-11-25 Philippe Normand + + Rubber-stamped by Xan Lopez. + + g_signal_accumulator_first_wins was introduced in glib 2.27.1 so + no need to use our version if that version of glib is used during + the build. + + * platform/gtk/GtkVersioning.c: + * platform/gtk/GtkVersioning.h: + 2010-11-24 Jian Li Reviewed by Kenneth Russell. diff --git a/WebCore/platform/gtk/GtkVersioning.c b/WebCore/platform/gtk/GtkVersioning.c index 6d78cd9..c3407ea 100644 --- a/WebCore/platform/gtk/GtkVersioning.c +++ b/WebCore/platform/gtk/GtkVersioning.c @@ -263,7 +263,7 @@ gdk_pixbuf_get_from_surface(cairo_surface_t * surface, #endif // GTK_API_VERSION_2 -#if !GLIB_CHECK_VERSION(2, 28, 0) +#if !GLIB_CHECK_VERSION(2, 27, 1) gboolean g_signal_accumulator_first_wins(GSignalInvocationHint *invocationHint, GValue *returnAccumulator, const GValue *handlerReturn, gpointer data) { g_value_copy(handlerReturn, returnAccumulator); diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h index 3921669..ea15a54 100644 --- a/WebCore/platform/gtk/GtkVersioning.h +++ b/WebCore/platform/gtk/GtkVersioning.h @@ -103,7 +103,7 @@ void gtk_adjustment_set_value(GtkAdjustment* adjusment, gdouble value); GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window); GdkCursor* blankCursor(); -#if !GLIB_CHECK_VERSION(2, 28, 0) +#if !GLIB_CHECK_VERSION(2, 27, 1) gboolean g_signal_accumulator_first_wins(GSignalInvocationHint* invocationHint, GValue* returnAccumulator, const GValue* handlerReturn, gpointer data); #endif -- 1.7.3.2