diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5b626edb7f..dd39d1b5ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-06  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* tui/tui-win.c (tui_set_focus): Use structure member 'generic'
+	instead of casting the structure type.
+
 2015-07-06  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* valops.c (search_struct_field): Remove OFFSET parameter.
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index feb360b021..629d54d8a4 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -1059,8 +1059,7 @@ The window name specified must be valid and visible.\n"));
 	tui_refresh_data_win ();
       xfree (buf_ptr);
       printf_filtered (_("Focus set to %s window.\n"),
-		       tui_win_name ((struct tui_gen_win_info *)
-				     tui_win_with_focus ()));
+		       tui_win_name (&tui_win_with_focus ()->generic));
     }
   else
     warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE);