[gtk+] Work around gcc stupidity
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc: 
- Subject: [gtk+] Work around gcc stupidity
- Date: Thu, 13 Mar 2014 02:48:28 +0000 (UTC)
commit 8d07911d73e7694b14b2a58a7d832c6fb1e9b204
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Mar 12 22:47:10 2014 -0400
    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
 gtk/gtkwidget.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index bf47657..9e2a4a4 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);
 
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]