Author: cazfi Date: Wed Aug 3 14:09:46 2016 New Revision: 33441 URL: http://svn.gna.org/viewcvs/freeciv?rev=33441&view=rev Log: Use INIT_BRACE_BEGIN and INIT_BRACE_END in settings.c as needed.
See patch #7519 Modified: trunk/server/settings.c Modified: trunk/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=33441&r1=33440&r2=33441&view=diff ============================================================================== --- trunk/server/settings.c (original) +++ trunk/server/settings.c Wed Aug 3 14:09:46 2016 @@ -1240,8 +1240,9 @@ _default) \ {name, sclass, al_read, al_write, short_help, extra_help, NULL, SSET_BOOL,\ scateg, slevel, \ + INIT_BRACE_BEGIN \ .boolean = {&value, _default, func_validate, bool_name, \ - FALSE}, func_action, FALSE}, + FALSE} INIT_BRACE_END , func_action, FALSE}, #define GEN_INT(name, value, sclass, scateg, slevel, al_read, al_write, \ short_help, extra_help, func_help, \ @@ -1249,8 +1250,9 @@ _min, _max, _default) \ {name, sclass, al_read, al_write, short_help, extra_help, func_help, \ SSET_INT, scateg, slevel, \ + INIT_BRACE_BEGIN \ .integer = {(int *) &value, _default, _min, _max, func_validate, \ - 0}, \ + 0} INIT_BRACE_END, \ func_action, FALSE}, #define GEN_STRING(name, value, sclass, scateg, slevel, al_read, al_write, \ @@ -1258,7 +1260,9 @@ _default) \ {name, sclass, al_read, al_write, short_help, extra_help, NULL, \ SSET_STRING, scateg, slevel, \ - .string = {value, _default, sizeof(value), func_validate, ""}, \ + INIT_BRACE_BEGIN \ + .string = {value, _default, sizeof(value), func_validate, ""} \ + INIT_BRACE_END, \ func_action, FALSE}, #define GEN_ENUM(name, value, sclass, scateg, slevel, al_read, al_write, \ @@ -1266,17 +1270,21 @@ func_action, func_name, _default) \ { name, sclass, al_read, al_write, short_help, extra_help, func_help, \ SSET_ENUM, scateg, slevel, \ + INIT_BRACE_BEGIN \ .enumerator = { &value, sizeof(value), _default, \ - func_validate, \ - (val_name_func_t) func_name, 0 }, func_action, FALSE}, + func_validate, \ + (val_name_func_t) func_name, 0 } INIT_BRACE_END, \ + func_action, FALSE}, #define GEN_BITWISE(name, value, sclass, scateg, slevel, al_read, al_write, \ short_help, extra_help, func_validate, func_action, \ func_name, _default) \ { name, sclass, al_read, al_write, short_help, extra_help, NULL, \ SSET_BITWISE, scateg, slevel, \ + INIT_BRACE_BEGIN \ .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \ - func_name, 0 }, func_action, FALSE}, + func_name, 0 } INIT_BRACE_END, \ + func_action, FALSE}, /* game settings */ static struct setting settings[] = { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits