Author: cazfi
Date: Wed Aug 3 14:09:53 2016
New Revision: 33442
URL: http://svn.gna.org/viewcvs/freeciv?rev=33442&view=rev
Log:
Use INIT_BRACE_BEGIN and INIT_BRACE_END in settings.c as needed.
See patch #7519
Modified:
branches/S2_6/server/settings.c
Modified: branches/S2_6/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=33442&r1=33441&r2=33442&view=diff
==============================================================================
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Wed Aug 3 14:09:53 2016
@@ -1216,8 +1216,9 @@
_default) \
{name, sclass, to_client, 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, to_client, \
short_help, extra_help, func_help, \
@@ -1225,8 +1226,9 @@
_min, _max, _default) \
{name, sclass, to_client, 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, to_client, \
@@ -1234,7 +1236,9 @@
_default) \
{name, sclass, to_client, 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, to_client, \
@@ -1242,17 +1246,20 @@
func_action, func_name, _default) \
{ name, sclass, to_client, 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},
+ (val_name_func_t) func_name, 0 } INIT_BRACE_END, \
+ 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, \
+ 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
