summaryrefslogtreecommitdiff
path: root/gtk/gtkwidget.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-03-12 22:47:10 -0400
committerMatthias Clasen <mclasen@redhat.com>2014-03-12 22:47:10 -0400
commit8d07911d73e7694b14b2a58a7d832c6fb1e9b204 (patch)
tree54061cce9e9b4f111ff1ce382ed90537188dd970 /gtk/gtkwidget.h
parent63fe6de94db663db991ea51960eef71a11babd72 (diff)
downloadgtk+-8d07911d73e7694b14b2a58a7d832c6fb1e9b204.tar.gz
Work around gcc stupidity
With -Wc++-compat, gcc warns about 'and' even in contexts where it poses absolutely no danger. https://bugzilla.gnome.org/show_bug.cgi?id=726136
Diffstat (limited to 'gtk/gtkwidget.h')
-rw-r--r--gtk/gtkwidget.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index bf47657b39..9e2a4a4d69 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -946,7 +946,8 @@ 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);