[Checkins] SVN: zope.app.container/branches/3.6/ merged changes from trunk (r 92281, 92445).

[Alex Smith]

Log message for revision 92446:
  
  merged changes from trunk (r 92281,92445).
  

Changed:
  U   zope.app.container/branches/3.6/CHANGES.txt
  U   zope.app.container/branches/3.6/src/zope/app/container/_zope_app_container_contained.c

-=-
Modified: zope.app.container/branches/3.6/CHANGES.txt
===================================================================
--- zope.app.container/branches/3.6/CHANGES.txt	2008-10-21 19:03:30 UTC (rev 92445)
+++ zope.app.container/branches/3.6/CHANGES.txt	2008-10-21 19:08:32 UTC (rev 92446)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.6.2 (unreleased)
+------------------
+
+- Fixed bug in ``_zope_app_container_contained.c``.
+
 3.6.1 (2008-10-15)
 ------------------
 

Modified: zope.app.container/branches/3.6/src/zope/app/container/_zope_app_container_contained.c
===================================================================
--- zope.app.container/branches/3.6/src/zope/app/container/_zope_app_container_contained.c	2008-10-21 19:03:30 UTC (rev 92445)
+++ zope.app.container/branches/3.6/src/zope/app/container/_zope_app_container_contained.c	2008-10-21 19:08:32 UTC (rev 92446)
@@ -36,6 +36,17 @@
 
 static PyObject *str_p_deactivate;
 
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+#define PY_SSIZE_T_MAX INT_MAX
+#define PY_SSIZE_T_MIN INT_MIN
+typedef Py_ssize_t (*lenfunc)(PyObject *);
+typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
+typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
+typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *);
+typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *);
+#endif
+
 typedef struct {
   cPersistent_HEAD
   PyObject *po_weaklist;