← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/python-compat.h

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/python-compat.h
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
17
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
 */
20
20
 
21
21
/* Provide the typedefs that pyrex does automatically in newer versions, to
28
28
/* http://www.python.org/dev/peps/pep-0353/ */
29
29
#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
30
30
    typedef int Py_ssize_t;
 
31
    typedef Py_ssize_t (*lenfunc)(PyObject *);
 
32
    typedef PyObject * (*ssizeargfunc)(PyObject *, Py_ssize_t);
 
33
    typedef PyObject * (*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t);
31
34
    #define PY_SSIZE_T_MAX INT_MAX
32
35
    #define PY_SSIZE_T_MIN INT_MIN
33
36
    #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
67
70
    #include "arpa/inet.h"
68
71
#endif
69
72
 
 
73
#include <stdio.h>
 
74
 
 
75
#ifdef _MSC_VER
 
76
#define  snprintf  _snprintf
 
77
#endif
 
78
 
 
79
/* Introduced in Python 2.6 */
 
80
#ifndef Py_TYPE
 
81
#  define Py_TYPE(o) ((o)->ob_type)
 
82
#endif
 
83
#ifndef Py_REFCNT
 
84
#  define Py_REFCNT(o) ((o)->ob_refcnt)
 
85
#endif
70
86
 
71
87
#endif /* _BZR_PYTHON_COMPAT_H */