Rev 4268: restore the old Py_ssize_t import in the pyrex files. in http://bzr.arbash-meinel.com/branches/bzr/1.14/bbc-merge

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.14/bbc-merge

------------------------------------------------------------
revno: 4268
revision-id: john at arbash-meinel.com-20090409164651-4ftiuwg8z84wnjz6
parent: john at arbash-meinel.com-20090408165207-y4s9n71eh995341t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bbc-merge
timestamp: Thu 2009-04-09 11:46:51 -0500
message:
  restore the old Py_ssize_t import in the pyrex files.
-------------- next part --------------
=== modified file 'bzrlib/_chk_map_pyx.pyx'
--- a/bzrlib/_chk_map_pyx.pyx	2009-04-08 16:33:19 +0000
+++ b/bzrlib/_chk_map_pyx.pyx	2009-04-09 16:46:51 +0000
@@ -17,7 +17,7 @@
 
 #python2.4 support
 cdef extern from "python-compat.h":
-    ctypedef int Py_ssize_t # Required for older pyrex versions
+    pass
 
 cdef extern from *:
     ctypedef unsigned int size_t
@@ -28,6 +28,7 @@
     void sprintf(char *, char *, ...)
 
 cdef extern from "Python.h":
+    ctypedef int Py_ssize_t # Required for older pyrex versions
     struct _PyObject:
         pass
     ctypedef _PyObject PyObject

=== modified file 'bzrlib/_groupcompress_pyx.pyx'
--- a/bzrlib/_groupcompress_pyx.pyx	2009-04-08 16:33:19 +0000
+++ b/bzrlib/_groupcompress_pyx.pyx	2009-04-09 16:46:51 +0000
@@ -18,10 +18,11 @@
 
 #python2.4 support
 cdef extern from "python-compat.h":
+    pass
+
+
+cdef extern from "Python.h":
     ctypedef int Py_ssize_t # Required for older pyrex versions
-
-
-cdef extern from "Python.h":
     int PyString_CheckExact(object)
     char * PyString_AS_STRING(object)
     Py_ssize_t PyString_GET_SIZE(object)