From d372c69aa95c457da4aa1f04a3dcc700d815c239 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Mon, 3 Mar 2014 16:34:56 +0100 Subject: [PATCH 2/2] use && instead of 'and' in deprecation warnings 'and' is a C++ keyword and -Wc++-compat finds it --- gtk/gtkwidget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index bf47657..cbcd9e9 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -946,7 +946,7 @@ GDK_AVAILABLE_IN_ALL void gtk_widget_set_allocation (GtkWidget *widget, const GtkAllocation *allocation); -GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width and gtk_widget_get_preferred_height) +GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_width && gtk_widget_get_preferred_height) void gtk_widget_get_requisition (GtkWidget *widget, GtkRequisition *requisition); -- 1.7.10.4