Merge pull request #268619 from tweag/lib-descriptions
[NixPkgs.git] / pkgs / development / libraries / gtk / patches / 2.0-clang.patch
blob1e2e73b9833d7287c4143e996e0b27916f39d3d8
1 diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
2 index 4317523fb8..3c09cd3ae8 100644
3 --- a/gtk/gtkscale.c
4 +++ b/gtk/gtkscale.c
5 @@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale *scale,
6 mark->position = position;
8 priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
9 - (GCompareFunc) compare_marks,
10 + (GCompareDataFunc) compare_marks,
11 GINT_TO_POINTER (
12 gtk_range_get_inverted (GTK_RANGE (scale))
13 ));
14 diff --git a/tests/testmenubars.c b/tests/testmenubars.c
15 index 416a939861..c65e82be26 100644
16 --- a/tests/testmenubars.c
17 +++ b/tests/testmenubars.c
18 @@ -21,7 +21,7 @@
19 #include <gtk/gtk.h>
21 static GtkWidget *
22 -create_menu (depth)
23 +create_menu (int depth, gboolean _unused)
25 GtkWidget *menu;
26 GtkWidget *menuitem;
27 @@ -35,19 +35,19 @@ create_menu (depth)
28 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
29 gtk_widget_show (menuitem);
30 gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
31 - create_menu (depth - 1));
32 + create_menu (depth - 1, _unused));
34 menuitem = gtk_menu_item_new_with_mnemonic ("Two");
35 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
36 gtk_widget_show (menuitem);
37 gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
38 - create_menu (depth - 1));
39 + create_menu (depth - 1, _unused));
41 menuitem = gtk_menu_item_new_with_mnemonic ("Three");
42 gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
43 gtk_widget_show (menuitem);
44 gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem),
45 - create_menu (depth - 1));
46 + create_menu (depth - 1, _unused));
48 return menu;