Author: cazfi Date: Wed Aug 3 00:52:29 2016 New Revision: 33426 URL: http://svn.gna.org/viewcvs/freeciv?rev=33426&view=rev Log: Reverted patch #7519 making settings.c to compile with tcc. It was breaking compilation with more important compilers.
Modified: branches/S2_5/server/settings.c Modified: branches/S2_5/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=33426&r1=33425&r2=33426&view=diff ============================================================================== --- branches/S2_5/server/settings.c (original) +++ branches/S2_5/server/settings.c Wed Aug 3 00:52:29 2016 @@ -1063,16 +1063,16 @@ _default) \ {name, sclass, to_client, short_help, extra_help, NULL, SSET_BOOL, \ scateg, slevel, \ - .boolean = {&value, _default, func_validate, bool_name, \ - FALSE}, func_action, FALSE}, + {.boolean = {&value, _default, func_validate, bool_name, \ + FALSE}}, func_action, FALSE}, #define GEN_INT(name, value, sclass, scateg, slevel, to_client, \ short_help, extra_help, func_validate, func_action, \ _min, _max, _default) \ {name, sclass, to_client, short_help, extra_help, NULL, SSET_INT, \ scateg, slevel, \ - .integer = {(int *) &value, _default, _min, _max, func_validate, \ - 0}, \ + {.integer = {(int *) &value, _default, _min, _max, func_validate, \ + 0}}, \ func_action, FALSE}, #define GEN_STRING(name, value, sclass, scateg, slevel, to_client, \ @@ -1080,7 +1080,7 @@ _default) \ {name, sclass, to_client, short_help, extra_help, NULL, SSET_STRING, \ scateg, slevel, \ - .string = {value, _default, sizeof(value), func_validate, ""}, \ + {.string = {value, _default, sizeof(value), func_validate, ""}}, \ func_action, FALSE}, #define GEN_ENUM(name, value, sclass, scateg, slevel, to_client, \ @@ -1088,17 +1088,17 @@ func_action, func_name, _default) \ { name, sclass, to_client, short_help, extra_help, func_help, SSET_ENUM, \ scateg, slevel, \ - .enumerator = { &value, sizeof(value), _default, \ - func_validate, \ - (val_name_func_t) func_name, 0 }, func_action, FALSE}, + { .enumerator = { &value, sizeof(value), _default, \ + func_validate, \ + (val_name_func_t) func_name, 0 }}, func_action, FALSE}, #define GEN_BITWISE(name, value, sclass, scateg, slevel, to_client, \ short_help, extra_help, func_validate, func_action, \ func_name, _default) \ { name, sclass, to_client, short_help, extra_help, NULL, SSET_BITWISE, \ scateg, slevel, \ - .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \ - func_name, 0 }, func_action, FALSE}, + { .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \ + func_name, 0 }}, func_action, FALSE}, /* game settings */ static struct setting settings[] = { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits