[Freeciv-commits] r32505 - in /trunk: client/packhand.c common/packets.def fc_version server/plrhand.c
Author: cazfi
Date: Wed Apr 27 20:59:43 2016
New Revision: 32505
URL: http://svn.gna.org/viewcvs/freeciv?rev=32505&view=rev
Log:
Changed network protocol so that only those policies slots that are in use in
current ruleset are
being sent as part of player info packet.
See bug #24611
Modified:
trunk/client/packhand.c
trunk/common/packets.def
trunk/fc_version
trunk/server/plrhand.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=32505&r1=32504&r2=32505&view=diff
==
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Wed Apr 27 20:59:43 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2319,6 +2319,8 @@
pplayer->revolution_finishes = pinfo->revolution_finishes;
pplayer->ai_common.skill_level = pinfo->ai_skill_level;
+ fc_assert(pinfo->multip_count == multiplier_count());
+ game.control.num_multipliers = pinfo->multip_count;
multipliers_iterate(pmul) {
pplayer->multipliers[multiplier_index(pmul)] =
pinfo->multiplier[multiplier_index(pmul)];
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=32505&r1=32504&r2=32505&view=diff
==
--- trunk/common/packets.def(original)
+++ trunk/common/packets.defWed Apr 27 20:59:43 2016
@@ -858,8 +858,9 @@
CITYSPE wonders[B_LAST]; diff
- SINT32 multiplier[MAX_NUM_MULTIPLIERS];
- SINT32 multiplier_target[MAX_NUM_MULTIPLIERS];
+ UINT8 multip_count;
+ SINT32 multiplier[MAX_NUM_MULTIPLIERS:multip_count];
+ SINT32 multiplier_target[MAX_NUM_MULTIPLIERS:multip_count];
end
PACKET_PLAYER_PHASE_DONE = 52; cs, dsend
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=32505&r1=32504&r2=32505&view=diff
==
--- trunk/fc_version(original)
+++ trunk/fc_versionWed Apr 27 20:59:43 2016
@@ -55,7 +55,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Apr.21"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Apr.27"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/plrhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=32505&r1=32504&r2=32505&view=diff
==
--- trunk/server/plrhand.c (original)
+++ trunk/server/plrhand.c Wed Apr 27 20:59:43 2016
@@ -1094,6 +1094,7 @@
}
/* multipliers */
+ packet->multip_count = multiplier_count();
if (info_level >= INFO_FULL) {
multipliers_iterate(pmul) {
packet->multiplier[multiplier_index(pmul)] =
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32506 - in /branches/S2_6: client/packhand.c common/packets.def fc_version server/plrhand.c
Author: cazfi
Date: Wed Apr 27 21:00:04 2016
New Revision: 32506
URL: http://svn.gna.org/viewcvs/freeciv?rev=32506&view=rev
Log:
Changed network protocol so that only those policies slots that are in use in
current ruleset are
being sent as part of player info packet.
See bug #24611
Modified:
branches/S2_6/client/packhand.c
branches/S2_6/common/packets.def
branches/S2_6/fc_version
branches/S2_6/server/plrhand.c
Modified: branches/S2_6/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=32506&r1=32505&r2=32506&view=diff
==
--- branches/S2_6/client/packhand.c (original)
+++ branches/S2_6/client/packhand.c Wed Apr 27 21:00:04 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -2271,6 +2271,8 @@
pplayer->revolution_finishes = pinfo->revolution_finishes;
pplayer->ai_common.skill_level = pinfo->ai_skill_level;
+ fc_assert(pinfo->multip_count == multiplier_count());
+ game.control.num_multipliers = pinfo->multip_count;
multipliers_iterate(pmul) {
pplayer->multipliers[multiplier_index(pmul)] =
pinfo->multiplier[multiplier_index(pmul)];
Modified: branches/S2_6/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=32506&r1=32505&r2=32506&view=diff
==
--- branches/S2_6/common/packets.def(original)
+++ branches/S2_6/common/packets.defWed Apr 27 21:00:04 2016
@@ -828,8 +828,9 @@
CITYSPE wonders[B_LAST]; diff
- SINT32 multiplier[MAX_NUM_MULTIPLIERS];
- SINT32 multiplier_target[MAX_NUM_MULTIPLIERS];
+ UINT8 multip_count;
+ SINT32 multiplier[MAX_NUM_MULTIPLIERS:multip_count];
+ SINT32 multiplier_target[MAX_NUM_MULTIPLIERS:multip_count];
end
PACKET_PLAYER_PHASE_DONE = 52; cs, dsend
Modified: branches/S2_6/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=32506&r1=32505&r2=32506&view=diff
==
--- branches/S2_6/fc_version(original)
+++ branches/S2_6/fc_versionWed Apr 27 21:00:04 2016
@@ -55,7 +55,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Apr.21"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Apr.27"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: branches/S2_6/server/plrhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/plrhand.c?rev=32506&r1=32505&r2=32506&view=diff
==
--- branches/S2_6/server/plrhand.c (original)
+++ branches/S2_6/server/plrhand.c Wed Apr 27 21:00:04 2016
@@ -1094,6 +1094,7 @@
}
/* multipliers */
+ packet->multip_count = multiplier_count();
if (info_level >= INFO_FULL) {
multipliers_iterate(pmul) {
packet->multiplier[multiplier_index(pmul)] =
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32507 - /trunk/doc/README.msys2
Author: cazfi Date: Wed Apr 27 21:07:38 2016 New Revision: 32507 URL: http://svn.gna.org/viewcvs/freeciv?rev=32507&view=rev Log: Moved MIN_WIN_VER documentation to Build-section in README.msys2 See patch #7150 Modified: trunk/doc/README.msys2 Modified: trunk/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.msys2?rev=32507&r1=32506&r2=32507&view=diff == --- trunk/doc/README.msys2 (original) +++ trunk/doc/README.msys2 Wed Apr 27 21:07:38 2016 @@ -115,14 +115,6 @@ - Clients other than gtk3 - MagickWand support - You can also set minimum Windows version targeted. While setting this - to an older version allows those Windows versions to run the created - executables, it may come with the cost of disabling functionality that - newer Windows versions could otherwise have. - The version is set via MIN_WIN_VER variable. For values to use, see - list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx - Current default is 0x0600 (Vista). - Build @@ -142,6 +134,14 @@ - gtk3 - qt - "ruledit-installer" + + You can also set minimum Windows version targeted. While setting this + to an older version allows those Windows versions to run the created + executables, it may come with the cost of disabling functionality that + newer Windows versions could otherwise have. + The version is set via MIN_WIN_VER variable. For values to use, see + list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx + Current default is 0x0600 (Vista). Problems ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32508 - /branches/S2_6/doc/README.msys2
Author: cazfi Date: Wed Apr 27 21:07:44 2016 New Revision: 32508 URL: http://svn.gna.org/viewcvs/freeciv?rev=32508&view=rev Log: Moved MIN_WIN_VER documentation to Build-section in README.msys2 See patch #7150 Modified: branches/S2_6/doc/README.msys2 Modified: branches/S2_6/doc/README.msys2 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.msys2?rev=32508&r1=32507&r2=32508&view=diff == --- branches/S2_6/doc/README.msys2 (original) +++ branches/S2_6/doc/README.msys2 Wed Apr 27 21:07:44 2016 @@ -111,14 +111,6 @@ - Clients other than gtk3 - MagickWand support - You can also set minimum Windows version targeted. While setting this - to an older version allows those Windows versions to run the created - executables, it may come with the cost of disabling functionality that - newer Windows versions could otherwise have. - The version is set via MIN_WIN_VER variable. For values to use, see - list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx - Current default is 0x0600 (Vista). - Build @@ -138,6 +130,14 @@ - gtk3 - qt - "ruledit-installer" + + You can also set minimum Windows version targeted. While setting this + to an older version allows those Windows versions to run the created + executables, it may come with the cost of disabling functionality that + newer Windows versions could otherwise have. + The version is set via MIN_WIN_VER variable. For values to use, see + list in: https://msdn.microsoft.com/en-us/library/6sehtctf.aspx + Current default is 0x0600 (Vista). ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32509 - in /trunk: common/extras.c common/extras.h server/savecompat.c server/savecompat.h
Author: cazfi
Date: Wed Apr 27 21:56:52 2016
New Revision: 32509
URL: http://svn.gna.org/viewcvs/freeciv?rev=32509&view=rev
Log:
Moved special_extra_get() to savecompat.c
See patch #7152
Modified:
trunk/common/extras.c
trunk/common/extras.h
trunk/server/savecompat.c
trunk/server/savecompat.h
Modified: trunk/common/extras.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.c?rev=32509&r1=32508&r2=32509&view=diff
==
--- trunk/common/extras.c (original)
+++ trunk/common/extras.c Wed Apr 27 21:56:52 2016
@@ -170,20 +170,6 @@
return &extras[id];
}
-/
- Get extra of the given special
-/
-struct extra_type *special_extra_get(int spe)
-{
- struct extra_type_list *elist = extra_type_list_by_cause(EC_SPECIAL);
-
- if (spe < extra_type_list_size(elist)) {
-return extra_type_list_get(elist, spe);
- }
-
- return NULL;
-}
-
/**
Return the (translated) name of the extra type.
You don't have to free the return pointer.
Modified: trunk/common/extras.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/extras.h?rev=32509&r1=32508&r2=32509&view=diff
==
--- trunk/common/extras.h (original)
+++ trunk/common/extras.h Wed Apr 27 21:56:52 2016
@@ -1,4 +1,4 @@
-/**
+/***
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -154,11 +154,9 @@
struct extra_type *extra_by_number(int id);
/* For optimization purposes (being able to have it as macro instead of
function
- * call) this is now same as extra_number(). extras.c does have sematically
correct
+ * call) this is now same as extra_number(). extras.c does have semantically
correct
* implementation too. */
#define extra_index(_e_) (_e_)->id
-
-struct extra_type *special_extra_get(int spe);
const char *extra_name_translation(const struct extra_type *pextra);
const char *extra_rule_name(const struct extra_type *pextra);
Modified: trunk/server/savecompat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=32509&r1=32508&r2=32509&view=diff
==
--- trunk/server/savecompat.c (original)
+++ trunk/server/savecompat.c Wed Apr 27 21:56:52 2016
@@ -233,6 +233,20 @@
fc_assert(type >= 0 && type < S_LAST);
return special_names[type];
+}
+
+/
+ Get extra of the given special
+/
+struct extra_type *special_extra_get(int spe)
+{
+ struct extra_type_list *elist = extra_type_list_by_cause(EC_SPECIAL);
+
+ if (spe < extra_type_list_size(elist)) {
+return extra_type_list_get(elist, spe);
+ }
+
+ return NULL;
}
/* ===
Modified: trunk/server/savecompat.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.h?rev=32509&r1=32508&r2=32509&view=diff
==
--- trunk/server/savecompat.h (original)
+++ trunk/server/savecompat.h Wed Apr 27 21:56:52 2016
@@ -165,6 +165,7 @@
enum tile_special_type special_by_rule_name(const char *name);
const char *special_rule_name(enum tile_special_type type);
+struct extra_type *special_extra_get(int spe);
enum ai_level ai_level_convert(int old_level);
enum barbarian_type barb_type_convert(int old_type);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32510 - /branches/S2_6/common/extras.h
Author: cazfi Date: Wed Apr 27 21:59:48 2016 New Revision: 32510 URL: http://svn.gna.org/viewcvs/freeciv?rev=32510&view=rev Log: Comment typofix: "sematically" -> "semantically" Modified: branches/S2_6/common/extras.h Modified: branches/S2_6/common/extras.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/extras.h?rev=32510&r1=32509&r2=32510&view=diff == --- branches/S2_6/common/extras.h (original) +++ branches/S2_6/common/extras.h Wed Apr 27 21:59:48 2016 @@ -1,4 +1,4 @@ -/** +/*** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -135,7 +135,7 @@ struct extra_type *extra_by_number(int id); /* For optimization purposes (being able to have it as macro instead of function - * call) this is now same as extra_number(). extras.c does have sematically correct + * call) this is now same as extra_number(). extras.c does have semantically correct * implementation too. */ #define extra_index(_e_) (_e_)->id ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32511 - in /trunk: configure.ac m4/gtk2-client.m4
Author: cazfi Date: Wed Apr 27 22:20:21 2016 New Revision: 32511 URL: http://svn.gna.org/viewcvs/freeciv?rev=32511&view=rev Log: Do not autoselect unsupported gtk2-client or modpack installer. See patch #7128 Modified: trunk/configure.ac trunk/m4/gtk2-client.m4 Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32511&r1=32510&r2=32511&view=diff == --- trunk/configure.ac (original) +++ trunk/configure.ac Wed Apr 27 22:20:21 2016 @@ -1056,7 +1056,7 @@ fi if test "x$req_fcmp_gtk2" = "xyes" || - test "x$modinst" = "xauto" || test "x$modinst" = "xall" ; then + test "x$modinst" = "xall" ; then AM_PATH_GTK_2_0([2.12.0], [ PKG_CHECK_MODULES([GTHREAD_GTK2], [gthread-2.0], Modified: trunk/m4/gtk2-client.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/gtk2-client.m4?rev=32511&r1=32510&r2=32511&view=diff == --- trunk/m4/gtk2-client.m4 (original) +++ trunk/m4/gtk2-client.m4 Wed Apr 27 22:20:21 2016 @@ -5,7 +5,7 @@ AC_DEFUN([FC_GTK2_CLIENT], [ - if test "x$gui_gtk2" = "xyes" || test "x$client" = "xauto" || + if test "x$gui_gtk2" = "xyes" || test "x$client" = "xall" ; then AM_PATH_GTK_2_0(2.12.0, [ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32512 - in /trunk/server: savegame2.c savegame3.c
Author: cazfi
Date: Thu Apr 28 05:59:11 2016
New Revision: 32512
URL: http://svn.gna.org/viewcvs/freeciv?rev=32512&view=rev
Log:
Have 'have_resources' as map parameter, and not as general capability
'specials', in savegame3.c saves.
See patch #7148
Modified:
trunk/server/savegame2.c
trunk/server/savegame3.c
Modified: trunk/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=32512&r1=32511&r2=32512&view=diff
==
--- trunk/server/savegame2.c(original)
+++ trunk/server/savegame2.cThu Apr 28 05:59:11 2016
@@ -1801,7 +1801,7 @@
/* This defaults to TRUE even if map has not been generated. Also,
* old versions have also explicitly saved TRUE even in pre-game.
* We rely on that
- * 1) scenario maps have it explicity right.
+ * 1) scenario maps have it explicitly right.
* 2) when map is actually generated, it re-initialize this to FALSE. */
game.map.server.have_huts
= secfile_lookup_bool_default(loading->file, TRUE, "map.have_huts");
Modified: trunk/server/savegame3.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=32512&r1=32511&r2=32512&view=diff
==
--- trunk/server/savegame3.c(original)
+++ trunk/server/savegame3.cThu Apr 28 05:59:11 2016
@@ -272,7 +272,7 @@
static const char savefile_options_default[] =
" +version3";
/* The following savefile option are added if needed:
- * - specials
+ * - nothing at current version
* See also calls to sg_save_savefile_options(). */
static const char num_chars[] =
@@ -2400,10 +2400,12 @@
/* This defaults to TRUE even if map has not been generated.
* We rely on that
- * 1) scenario maps have it explicity right.
+ * 1) scenario maps have it explicitly right.
* 2) when map is actually generated, it re-initialize this to FALSE. */
game.map.server.have_huts
= secfile_lookup_bool_default(loading->file, TRUE, "map.have_huts");
+ game.map.server.have_resources
+= secfile_lookup_bool_default(loading->file, TRUE, "map.have_resources");
if (S_S_INITIAL == loading->server_state
&& MAPGEN_SCENARIO == game.map.server.generator) {
@@ -2447,8 +2449,10 @@
if (saving->scenario) {
secfile_insert_bool(saving->file, game.map.server.have_huts,
"map.have_huts");
+secfile_insert_bool(saving->file, game.map.server.have_resources,
"map.have_resources");
} else {
secfile_insert_bool(saving->file, TRUE, "map.have_huts");
+secfile_insert_bool(saving->file, TRUE, "map.have_resources");
}
/* For debugging purposes only.
@@ -2552,7 +2556,7 @@
if (S_S_INITIAL != loading->server_state
|| MAPGEN_SCENARIO != game.map.server.generator
- || has_capability("specials", loading->secfile_options)) {
+ || game.map.server.have_resources) {
whole_map_iterate(ptile) {
extra_type_by_cause_iterate(EC_RESOURCE, pres) {
if (tile_has_extra(ptile, pres)) {
@@ -2564,8 +2568,6 @@
}
} extra_type_by_cause_iterate_end;
} whole_map_iterate_end;
-
-game.map.server.have_resources = TRUE;
}
}
@@ -2576,10 +2578,6 @@
{
/* Check status and return if not OK (sg_success != TRUE). */
sg_check_ret();
-
- if (game.map.server.have_resources) {
-sg_save_savefile_options(saving, " specials");
- }
/* Save extras. */
halfbyte_iterate_extras(j, game.control.num_extra_types) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32513 - /trunk/m4/debug.m4
Author: cazfi Date: Thu Apr 28 06:32:38 2016 New Revision: 32513 URL: http://svn.gna.org/viewcvs/freeciv?rev=32513&view=rev Log: Disabled nonnull-compare compiler errors from debug builds. See patch #7156 Modified: trunk/m4/debug.m4 Modified: trunk/m4/debug.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/debug.m4?rev=32513&r1=32512&r2=32513&view=diff == --- trunk/m4/debug.m4 (original) +++ trunk/m4/debug.m4 Thu Apr 28 06:32:38 2016 @@ -49,12 +49,12 @@ AC_DEFINE([LUA_USE_APICHECK], [1], [Lua Api checks]) FC_C_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security -Wnested-externs \ + -Wformat -Wformat-security -Wnested-externs -Wno-nonnull-compare \ -Wshadow], [], [EXTRA_DEBUG_CFLAGS]) if test "x$cxx_works" = "xyes" ; then FC_CXX_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security], + -Wformat -Wformat-security -Wno-nonnull-compare], [], [EXTRA_DEBUG_CXXFLAGS]) fi ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32514 - /branches/S2_6/m4/debug.m4
Author: cazfi Date: Thu Apr 28 06:32:47 2016 New Revision: 32514 URL: http://svn.gna.org/viewcvs/freeciv?rev=32514&view=rev Log: Disabled nonnull-compare compiler errors from debug builds. See patch #7156 Modified: branches/S2_6/m4/debug.m4 Modified: branches/S2_6/m4/debug.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/debug.m4?rev=32514&r1=32513&r2=32514&view=diff == --- branches/S2_6/m4/debug.m4 (original) +++ branches/S2_6/m4/debug.m4 Thu Apr 28 06:32:47 2016 @@ -49,12 +49,12 @@ AC_DEFINE([LUA_USE_APICHECK], [1], [Lua Api checks]) FC_C_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security -Wnested-externs \ + -Wformat -Wformat-security -Wnested-externs -Wno-nonnull-compare \ -Wshadow], [], [EXTRA_DEBUG_CFLAGS]) if test "x$cxx_works" = "xyes" ; then FC_CXX_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security], + -Wformat -Wformat-security -Wno-nonnull-compare], [], [EXTRA_DEBUG_CXXFLAGS]) fi ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r32515 - /branches/S2_5/m4/debug.m4
Author: cazfi Date: Thu Apr 28 06:33:06 2016 New Revision: 32515 URL: http://svn.gna.org/viewcvs/freeciv?rev=32515&view=rev Log: Disabled nonnull-compare compiler errors from debug builds. See patch #7156 Modified: branches/S2_5/m4/debug.m4 Modified: branches/S2_5/m4/debug.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/debug.m4?rev=32515&r1=32514&r2=32515&view=diff == --- branches/S2_5/m4/debug.m4 (original) +++ branches/S2_5/m4/debug.m4 Thu Apr 28 06:33:06 2016 @@ -47,11 +47,11 @@ AC_DEFINE([LUA_USE_APICHECK], [1], [Lua Api checks]) FC_C_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security -Wnested-externs], + -Wformat -Wformat-security -Wnested-externs -Wno-nonnull-compare], [], [EXTRA_DEBUG_CFLAGS]) if test "x$cxx_works" = "xyes" ; then FC_CXX_FLAGS([-Werror -Wmissing-prototypes -Wmissing-declarations \ - -Wformat -Wformat-security], + -Wformat -Wformat-security -Wno-nonnull-compare], [], [EXTRA_DEBUG_CXXFLAGS]) fi ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
