0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compilation with Python 2.6 (bug #12638 (included a patch)).

Browse source
This commit is contained in:
Mark de Wever 2008-12-09 14:02:51 +00:00
parent 4710e2b2c0
commit cb2b8708b8
2 changed files with 120 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -64,6 +64,7 @@ Version 1.5.6+svn:
* Fixed random memory corruption/assertion failure/massive leak due
to story screens.
* Fixed [role] not working when no type was specified (bug #12660).
* Fixed compilation with Python 2.6 (bug #12638 (included a patch)).
Version 1.5.6:
* Authoring tools:

245
src/ai_python.cpp
View file

@ -255,25 +255,24 @@ static PyTypeObject wesnoth_unittype_type = {
unittype_methods, /* tp_methods */
0, /* tp_members */
unittype_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -390,25 +389,24 @@ static PyTypeObject wesnoth_attacktype_type = {
attacktype_methods, /* tp_methods */
0, /* tp_members */
attacktype_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -710,25 +708,24 @@ static PyTypeObject wesnoth_unit_type = {
unit_methods, /* tp_methods */
0, /* tp_members */
unit_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -824,25 +821,24 @@ static PyTypeObject wesnoth_location_type = {
location_methods, /* tp_methods */
0, /* tp_members */
location_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -1000,25 +996,24 @@ static PyTypeObject wesnoth_gamemap_type = {
gamemap_methods, /* tp_methods */
0, /* tp_members */
gamemap_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -1189,25 +1184,24 @@ static PyTypeObject wesnoth_team_type = {
team_methods, /* tp_methods */
0, /* tp_members */
team_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};
@ -1332,25 +1326,24 @@ static PyTypeObject wesnoth_gamestatus_type = {
gamestatus_methods, /* tp_methods */
0, /* tp_members */
gamestatus_getseters, /* tp_getset */
NULL,
NULL,
NULL,
NULL,
0,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL, /* tp_base */
NULL, /* tp_dict */
NULL, /* tp_descr_get */
NULL, /* tp_descr_set */
0, /* tp_dictoffset */
NULL, /* tp_init */
NULL, /* tp_alloc */
NULL, /* tp_new */
NULL, /* tp_free */
NULL, /* tp_is_gc */
NULL, /* tp_bases */
NULL, /* tp_mro */
NULL, /* tp_cache */
NULL, /* tp_subclasses */
NULL, /* tp_weaklist */
NULL, /* tp_del */
#if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 6
0,
NULL,
0, /* tp_version_tag */
#endif
};