Author: cazfi
Date: Wed Aug 3 10:32:21 2016
New Revision: 33433
URL: http://svn.gna.org/viewcvs/freeciv?rev=33433&view=rev
Log:
Do not pass const parameter as va_arg.
See patch #7526
Modified:
trunk/common/featured_text.c
trunk/common/featured_text.h
Modified: trunk/common/featured_text.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/featured_text.c?rev=33433&r1=33432&r2=33433&view=diff
==============================================================================
--- trunk/common/featured_text.c (original)
+++ trunk/common/featured_text.c Wed Aug 3 10:32:21 2016
@@ -77,7 +77,7 @@
const struct ft_color ftc_client = FT_COLOR("#EF7F00", NULL);
const struct ft_color ftc_editor = FT_COLOR("#0000FF", NULL);
const struct ft_color ftc_command = FT_COLOR("#006400", NULL);
-const struct ft_color ftc_changed = FT_COLOR("#FF0000", NULL);
+ struct ft_color ftc_changed = FT_COLOR("#FF0000", NULL);
const struct ft_color ftc_server_prompt = FT_COLOR("#FF0000", "#BEBEBE");
const struct ft_color ftc_player_lost = FT_COLOR("#FFFFFF", "#000000");
const struct ft_color ftc_game_start = FT_COLOR("#00FF00", "#115511");
@@ -399,7 +399,7 @@
return TRUE;
case TTT_COLOR:
{
- struct ft_color color = va_arg(args, struct ft_color);
+ const struct ft_color color = va_arg(args, struct ft_color);
if ((NULL == color.foreground || '\0' == color.foreground[0])
&& (NULL == color.background || '\0' == color.background[0])) {
Modified: trunk/common/featured_text.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/featured_text.h?rev=33433&r1=33432&r2=33433&view=diff
==============================================================================
--- trunk/common/featured_text.h (original)
+++ trunk/common/featured_text.h Wed Aug 3 10:32:21 2016
@@ -172,7 +172,7 @@
extern const struct ft_color ftc_client;
extern const struct ft_color ftc_editor;
extern const struct ft_color ftc_command;
-extern const struct ft_color ftc_changed;
+extern struct ft_color ftc_changed;
extern const struct ft_color ftc_server_prompt;
extern const struct ft_color ftc_player_lost;
extern const struct ft_color ftc_game_start;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
