Author: mordante Date: Tue Dec 9 15:02:51 2008 New Revision: 31391 URL: http://svn.gna.org/viewcvs/wesnoth?rev=31391&view=rev Log: Fixed compilation with Python 2.6 (bug #12638 (included a patch)).
Modified:
trunk/changelog
trunk/src/ai_python.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=31391&r1=31390&r2=31391&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Tue Dec 9 15:02:51 2008
@@ -64,6 +64,7 @@
* 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:
Modified: trunk/src/ai_python.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_python.cpp?rev=31391&r1=31390&r2=31391&view=diff
==============================================================================
--- trunk/src/ai_python.cpp (original)
+++ trunk/src/ai_python.cpp Tue Dec 9 15:02:51 2008
@@ -255,25 +255,24 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
