Revision: 3473 http://geany.svn.sourceforge.net/geany/?rev=3473&view=rev Author: ntrel Date: 2009-01-16 20:34:34 +0000 (Fri, 16 Jan 2009)

Log Message: ----------- Prevent type-punned pointer warnings with gcc 4.1.

Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/project.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-15 19:51:18 UTC (rev 3472) +++ trunk/ChangeLog 2009-01-16 20:34:34 UTC (rev 3473) @@ -1,3 +1,9 @@ +2009-01-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/project.c, src/keyfile.c: + Prevent type-punned pointer warnings with gcc 4.1. + + 2009-01-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

* src/main.c, doc/geany.txt, doc/geany.html, doc/geany.1.in:

Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-01-15 19:51:18 UTC (rev 3472) +++ trunk/src/keyfile.c 2009-01-16 20:34:34 UTC (rev 3473) @@ -138,9 +138,9 @@ "pref_editor_tab_width", 4, "spin_indent_width"); stash_group_add_spin_button_integer(group, &editor_prefs.indentation->hard_tab_width, "indent_hard_tab_width", 8, "spin_tab_width"); - stash_group_add_combo_box(group, (gint*)&editor_prefs.indentation->auto_indent_mode, + stash_group_add_combo_box(group, (gint*)(void*)&editor_prefs.indentation->auto_indent_mode, "indent_mode", GEANY_AUTOINDENT_CURRENTCHARS, "combo_auto_indent_mode"); - stash_group_add_radio_buttons(group, (gint*)&editor_prefs.indentation->type, + stash_group_add_radio_buttons(group, (gint*)(void*)&editor_prefs.indentation->type, "indent_type", GEANY_INDENT_TYPE_TABS, "radio_indent_spaces", GEANY_INDENT_TYPE_SPACES, "radio_indent_tabs", GEANY_INDENT_TYPE_TABS,

Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2009-01-15 19:51:18 UTC (rev 3472) +++ trunk/src/project.c 2009-01-16 20:34:34 UTC (rev 3473) @@ -1110,7 +1110,7 @@

stash_group_add_spin_button_integer(group, &indentation.width, "indent_width", 4, "spin_indent_width"); - stash_group_add_radio_buttons(group, (gint*)&indentation.type, + stash_group_add_radio_buttons(group, (gint*)(gpointer)&indentation.type, "indent_type", GEANY_INDENT_TYPE_TABS, "radio_indent_spaces", GEANY_INDENT_TYPE_SPACES, "radio_indent_tabs", GEANY_INDENT_TYPE_TABS, @@ -1120,7 +1120,7 @@ "indent_hard_tab_width", 8, "spin_tab_width"); stash_group_add_toggle_button(group, &indentation.detect_type, "detect_indent", FALSE, "check_detect_indent"); - stash_group_add_combo_box(group, (gint*)&indentation.auto_indent_mode, + stash_group_add_combo_box(group, (gint*)(gpointer)&indentation.auto_indent_mode, "indent_mode", GEANY_AUTOINDENT_CURRENTCHARS, "combo_auto_indent_mode"); }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.