Mercurial > hg
changeset 25076:14bf7679fb68
util.h: kill no longer needed definitions for Python < 2.6
see e1fb276d4619
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Thu, 14 May 2015 09:04:48 +0200 |
| parents | d1bd0fd07ee6 |
| children | 68633ff2b608 |
| files | mercurial/util.h |
| diffstat | 1 files changed, 0 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.h Thu May 14 16:28:28 2015 -0500 +++ b/mercurial/util.h Thu May 14 09:04:48 2015 +0200 @@ -57,50 +57,6 @@ #endif /* PY_MAJOR_VERSION */ -/* Backports from 2.6 */ -#if PY_VERSION_HEX < 0x02060000 - -#define Py_TYPE(ob) (ob)->ob_type -#define Py_SIZE(ob) (ob)->ob_size -#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, - -/* Shamelessly stolen from bytesobject.h */ -#define PyBytesObject PyStringObject -#define PyBytes_Type PyString_Type - -#define PyBytes_Check PyString_Check -#define PyBytes_CheckExact PyString_CheckExact -#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED -#define PyBytes_AS_STRING PyString_AS_STRING -#define PyBytes_GET_SIZE PyString_GET_SIZE -#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS - -#define PyBytes_FromStringAndSize PyString_FromStringAndSize -#define PyBytes_FromString PyString_FromString -#define PyBytes_FromFormatV PyString_FromFormatV -#define PyBytes_FromFormat PyString_FromFormat -#define PyBytes_Size PyString_Size -#define PyBytes_AsString PyString_AsString -#define PyBytes_Repr PyString_Repr -#define PyBytes_Concat PyString_Concat -#define PyBytes_ConcatAndDel PyString_ConcatAndDel -#define _PyBytes_Resize _PyString_Resize -#define _PyBytes_Eq _PyString_Eq -#define PyBytes_Format PyString_Format -#define _PyBytes_FormatLong _PyString_FormatLong -#define PyBytes_DecodeEscape PyString_DecodeEscape -#define _PyBytes_Join _PyString_Join -#define PyBytes_Decode PyString_Decode -#define PyBytes_Encode PyString_Encode -#define PyBytes_AsEncodedObject PyString_AsEncodedObject -#define PyBytes_AsEncodedString PyString_AsEncodedString -#define PyBytes_AsDecodedObject PyString_AsDecodedObject -#define PyBytes_AsDecodedString PyString_AsDecodedString -#define PyBytes_AsStringAndSize PyString_AsStringAndSize -#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping - -#endif /* PY_VERSION_HEX */ - #ifdef _WIN32 #ifdef _MSC_VER /* msvc 6.0 has problems */