Author: cazfi Date: Mon Aug 24 17:23:57 2015 New Revision: 29669 URL: http://svn.gna.org/viewcvs/freeciv?rev=29669&view=rev Log: Fixed -Wshadow warnings from sdl/2 client specific code.
See patch #6281 Modified: branches/S2_6/client/gui-sdl/action_dialog.c branches/S2_6/client/gui-sdl/alphablit.c branches/S2_6/client/gui-sdl/chatline.c branches/S2_6/client/gui-sdl/citydlg.c branches/S2_6/client/gui-sdl/cityrep.c branches/S2_6/client/gui-sdl/cma_fe.c branches/S2_6/client/gui-sdl/connectdlg.c branches/S2_6/client/gui-sdl/dialogs.c branches/S2_6/client/gui-sdl/diplodlg.c branches/S2_6/client/gui-sdl/finddlg.c branches/S2_6/client/gui-sdl/gotodlg.c branches/S2_6/client/gui-sdl/gui_tilespec.c branches/S2_6/client/gui-sdl/gui_tilespec.h branches/S2_6/client/gui-sdl/helpdlg.c branches/S2_6/client/gui-sdl/inteldlg.c branches/S2_6/client/gui-sdl/mapctrl.c branches/S2_6/client/gui-sdl/mapview.c branches/S2_6/client/gui-sdl/menu.c branches/S2_6/client/gui-sdl/optiondlg.c branches/S2_6/client/gui-sdl/plrdlg.c branches/S2_6/client/gui-sdl/repodlgs.c branches/S2_6/client/gui-sdl/spaceshipdlg.c branches/S2_6/client/gui-sdl/widget.c branches/S2_6/client/gui-sdl/widget.h branches/S2_6/client/gui-sdl/widget_button.c branches/S2_6/client/gui-sdl/widget_checkbox.c branches/S2_6/client/gui-sdl/widget_combo.c branches/S2_6/client/gui-sdl/widget_edit.c branches/S2_6/client/gui-sdl/widget_p.h branches/S2_6/client/gui-sdl/widget_scrollbar.c branches/S2_6/client/gui-sdl/widget_window.c branches/S2_6/client/gui-sdl/wldlg.c branches/S2_6/client/gui-sdl/wldlg.h branches/S2_6/client/gui-sdl2/action_dialog.c branches/S2_6/client/gui-sdl2/chatline.c branches/S2_6/client/gui-sdl2/citydlg.c branches/S2_6/client/gui-sdl2/cityrep.c branches/S2_6/client/gui-sdl2/cma_fe.c branches/S2_6/client/gui-sdl2/connectdlg.c branches/S2_6/client/gui-sdl2/dialogs.c branches/S2_6/client/gui-sdl2/diplodlg.c branches/S2_6/client/gui-sdl2/finddlg.c branches/S2_6/client/gui-sdl2/gotodlg.c branches/S2_6/client/gui-sdl2/gui_tilespec.c branches/S2_6/client/gui-sdl2/gui_tilespec.h branches/S2_6/client/gui-sdl2/helpdlg.c branches/S2_6/client/gui-sdl2/inteldlg.c branches/S2_6/client/gui-sdl2/mapctrl.c branches/S2_6/client/gui-sdl2/mapview.c branches/S2_6/client/gui-sdl2/menu.c branches/S2_6/client/gui-sdl2/optiondlg.c branches/S2_6/client/gui-sdl2/plrdlg.c branches/S2_6/client/gui-sdl2/repodlgs.c branches/S2_6/client/gui-sdl2/spaceshipdlg.c branches/S2_6/client/gui-sdl2/widget.c branches/S2_6/client/gui-sdl2/widget.h branches/S2_6/client/gui-sdl2/widget_button.c branches/S2_6/client/gui-sdl2/widget_checkbox.c branches/S2_6/client/gui-sdl2/widget_combo.c branches/S2_6/client/gui-sdl2/widget_edit.c branches/S2_6/client/gui-sdl2/widget_p.h branches/S2_6/client/gui-sdl2/widget_scrollbar.c branches/S2_6/client/gui-sdl2/widget_window.c branches/S2_6/client/gui-sdl2/wldlg.c branches/S2_6/client/gui-sdl2/wldlg.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/client/gui-sdl/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialog.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/alphablit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/alphablit.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/chatline.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/chatline.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/citydlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/cityrep.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/cma_fe.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/connectdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/connectdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/dialogs.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/diplodlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/finddlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/finddlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/gotodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gotodlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/gui_tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_tilespec.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/gui_tilespec.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_tilespec.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/helpdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/inteldlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/mapctrl.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapctrl.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapview.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/menu.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/optiondlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/optiondlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/plrdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/plrdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/repodlgs.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/spaceshipdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/spaceshipdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_button.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_button.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_checkbox.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_checkbox.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_combo.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_combo.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_edit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_edit.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_p.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_p.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_scrollbar.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_scrollbar.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/widget_window.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/widget_window.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/wldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/wldlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl/wldlg.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/wldlg.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/action_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/action_dialog.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/chatline.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/chatline.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/citydlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/cityrep.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/cma_fe.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/connectdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/connectdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/dialogs.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/diplodlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/finddlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/finddlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/gotodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gotodlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/gui_tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_tilespec.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/gui_tilespec.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_tilespec.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/helpdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/inteldlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/mapctrl.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapctrl.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapview.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/menu.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/optiondlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/optiondlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/plrdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/plrdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/repodlgs.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/spaceshipdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/spaceshipdlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_button.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_button.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_checkbox.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_checkbox.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_combo.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_combo.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_edit.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_edit.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_p.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_p.h?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_scrollbar.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_scrollbar.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/widget_window.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/widget_window.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/wldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/wldlg.c?rev=29669&r1=29668&r2=29669&view=diff Modified: branches/S2_6/client/gui-sdl2/wldlg.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/wldlg.h?rev=29669&r1=29668&r2=29669&view=diff _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits