Author: shadowmaster
Date: Tue Mar 22 20:34:33 2011
New Revision: 48975
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48975&view=rev
Log:
config: Rename VERSION symbol to WESNOTH_VERSION
Modified:
trunk/changelog
trunk/src/config_cache.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=48975&r1=48974&r2=48975&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Mar 22 20:34:33 2011
@@ -62,7 +62,7 @@
* Introduced [move_unit]check_passability= (default yes, previously it was
always yes/non-existent) key to allow disabling the check for suitable
terrain.
* Added TAKE_IT_STRING and LEAVE_IT_STRING arguments to PICKUPPABLE_ITEM
- * Added an engine-defined VERSION macro that expands to the Wesnoth engine
+ * Added an engine-defined WESNOTH_VERSION macro that expands to the Wesnoth
engine
version string.
* The tags [remove_shroud] and [place_shroud] now take comma-separated
lists of sides.
They default to affecting all sides now if no side is set.
Modified: trunk/src/config_cache.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/config_cache.cpp?rev=48975&r1=48974&r2=48975&view=diff
==============================================================================
--- trunk/src/config_cache.cpp (original)
+++ trunk/src/config_cache.cpp Tue Mar 22 20:34:33 2011
@@ -82,7 +82,7 @@
defines_map_["APPLE"] = preproc_define();
#endif
- defines_map_["VERSION"] =
preproc_define(game_config::wesnoth_version.str());
+ defines_map_["WESNOTH_VERSION"] =
preproc_define(game_config::wesnoth_version.str());
}
@@ -164,7 +164,7 @@
if(i->second.value != "" || i->second.arguments.empty()
== false) {
// VERSION is defined non-empty by the engine,
// it should be safe to rely on caches
containing it.
- if(i->first != "VERSION") {
+ if(i->first != "WESNOTH_VERSION") {
is_valid = false;
ERR_CACHE << "Preprocessor define not
valid\n";
break;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
