Author: cazfi Date: Mon Aug 8 01:59:51 2016 New Revision: 33506 URL: http://svn.gna.org/viewcvs/freeciv?rev=33506&view=rev Log: Use proper INIT_BRACES macros in options.c.
See patch #7560 Modified: branches/S2_6/client/options.c Modified: branches/S2_6/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=33506&r1=33505&r2=33506&view=diff ============================================================================== --- branches/S2_6/client/options.c (original) +++ branches/S2_6/client/options.c Mon Aug 8 01:59:51 2016 @@ -465,9 +465,9 @@ .poptset = optset, \ .type = spec_type, \ .common_vtable = &common_table, \ - { \ + INIT_BRACE_BEGIN \ .spec_table_var = &spec_table \ - }, \ + INIT_BRACE_END, \ .changed_callback = changed_cb, \ .callback_data = cb_data, \ .gui_data = NULL \ @@ -1415,12 +1415,12 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .boolean = { \ .pvalue = &gui_options.oname, \ .def = odef, \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1451,14 +1451,14 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .integer = { \ .pvalue = &gui_options.oname, \ .def = odef, \ .min = omin, \ .max = omax \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1489,14 +1489,14 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .string = { \ .pvalue = gui_options.oname, \ .size = sizeof(gui_options.oname), \ .def = odef, \ .val_accessor = NULL \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1530,14 +1530,14 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .string = { \ .pvalue = gui_options.oname, \ .size = sizeof(gui_options.oname), \ .def = odef, \ .val_accessor = oacc \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1567,7 +1567,7 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .enumerator = { \ .pvalue = (int *) &gui_options.oname, \ .def = odef, \ @@ -1575,7 +1575,7 @@ .pretty_names = NULL, \ .name_accessor = oacc \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1606,7 +1606,7 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .bitwise = { \ .pvalue = &gui_options.oname, \ .def = odef, \ @@ -1614,7 +1614,7 @@ .pretty_names = NULL, \ .name_accessor = oacc \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1646,14 +1646,14 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .font = { \ .pvalue = gui_options.oname, \ .size = sizeof(gui_options.oname), \ .def = odef, \ .target = otgt, \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1683,12 +1683,12 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .color = { \ .pvalue = &gui_options.oname, \ .def = FT_COLOR(odef_fg, odef_bg) \ } \ - }, \ + INIT_BRACE_END \ } /* @@ -1719,12 +1719,12 @@ .help_text = ohelp, \ .category = ocat, \ .specific = ospec, \ - { \ + INIT_BRACE_BEGIN \ .video_mode = { \ .pvalue = &gui_options.oname, \ .def = VIDEO_MODE(odef_width, odef_height) \ } \ - }, \ + INIT_BRACE_END \ } /**************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits