diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-09-04 06:16:31 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-09-04 06:59:24 -0300 |
commit | ab49eda5720583b0470a329434554e97c735e696 (patch) | |
tree | 01dd96abb868c597d9c16023c7feefaacda9ef84 /src/camorama-window.c | |
parent | 39b0f779f454e7c4c58cc68352998e7f5ed7ab99 (diff) |
Rename camera struct typedef from cam to cam_t
Depending on the gcc options, that causes a fatal warning:
v4l.c:36:37: error: declaration of ‘cam’ shadows a global declaration [-Werror=shadow]
static void insert_resolution(cam * cam, int x, int y)
~~~~~~^~~
In file included from v4l.c:6:
v4l.h:99:3: note: shadowed declaration is here
} cam;
^~~
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'src/camorama-window.c')
-rw-r--r-- | src/camorama-window.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/camorama-window.c b/src/camorama-window.c index 7ba879e..a4565c8 100644 --- a/src/camorama-window.c +++ b/src/camorama-window.c @@ -92,7 +92,7 @@ menu_position_func(GtkMenu* menu, gint* x, gint* y, gboolean *push_in, gpointer } static void -show_popup(cam* cam, GtkTreeView* treeview, GdkEventButton* ev) { +show_popup(cam_t *cam, GtkTreeView* treeview, GdkEventButton* ev) { GtkMenu* menu = GTK_MENU(gtk_menu_new()); GtkWidget* item; GtkWidget* add_filters = gtk_menu_new(); @@ -144,12 +144,12 @@ show_popup(cam* cam, GtkTreeView* treeview, GdkEventButton* ev) { } static void -treeview_popup_menu_cb(cam* cam, GtkTreeView* treeview) { +treeview_popup_menu_cb(cam_t *cam, GtkTreeView* treeview) { show_popup(cam, treeview, NULL); } static gboolean -treeview_clicked_cb(cam* cam, GdkEventButton* ev, GtkTreeView* treeview) { +treeview_clicked_cb(cam_t *cam, GdkEventButton* ev, GtkTreeView* treeview) { gboolean retval = GTK_WIDGET_GET_CLASS(treeview)->button_press_event(GTK_WIDGET(treeview), ev); if(ev->button == 3) { @@ -161,7 +161,7 @@ treeview_clicked_cb(cam* cam, GdkEventButton* ev, GtkTreeView* treeview) { } static void -tray_clicked_callback (GtkStatusIcon* status, guint button, guint activate_time, cam * cam){ +tray_clicked_callback (GtkStatusIcon* status, guint button, guint activate_time, cam_t *cam){ // FIXME: change to switch if (button == 1) { if (gtk_widget_get_visible @@ -187,7 +187,7 @@ tray_clicked_callback (GtkStatusIcon* status, guint button, guint activate_time, } void -load_interface(cam* cam) { +load_interface(cam_t *cam) { int i; gchar *title; GdkPixbuf *logo = NULL; |