Commits

Jeff Sparkes  committed 2cb1ba3

Add a couple of casts to make gcc 4.8 happy.

* event-gtk.c (gtk_what_callback): Cast gpointer when assigning.
(select_filedesc): Cast flag combination to GIOCondition.
(init_event_gtk_late): Ditto.

  • Participants
  • Parent commits ae9476f

Comments (0)

Files changed (2)

File src/ChangeLog.GTK

+2013-11-19  Jeff Sparkes  <jsparkes@gmail.com>
+
+	* event-gtk.c (gtk_what_callback): Cast gpointer when assigning.
+	(select_filedesc): Cast flag combination to GIOCondition.
+	(init_event_gtk_late): Ditto.
+
 2013-11-17  Jeff Sparkes  <jsparkes@gmail.com>
 
 	* frame-gtk.c (gtk_toolbar_plist): Handle without HAVE_TOOLBARS.

File src/event-gtk.c

 		   GIOCondition UNUSED (condition),
 		   gpointer data)
 {
-  struct what_is_ready_closure *closure = data;
+  struct what_is_ready_closure *closure = (struct what_is_ready_closure *) data;
 
   assert (channel);
 
   closure->channel = g_io_channel_unix_new (fd);
   closure->what = what;
   /* Adding HUP was essential to getting shell-mode to work. */
-  closure->id = g_io_add_watch (closure->channel, G_IO_IN | G_IO_HUP,
+  closure->id = g_io_add_watch (closure->channel, (GIOCondition) (G_IO_IN | G_IO_HUP),
 				gtk_what_callback, closure);
   filedesc_to_what_closure[fd] = closure;
 }
 #endif
 
   g_io_add_watch (g_io_channel_unix_new (signal_event_pipe[0]),
-		  G_IO_IN | G_IO_HUP, gtk_what_callback, NULL);
+		  (GIOCondition) (G_IO_IN | G_IO_HUP), gtk_what_callback, NULL);
 }
 
 /* Bogus utility routines */