Mercurial > hg
comparison mercurial/util.h @ 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 | 80d28a88137f |
children | 284d742e5611 |
comparison
equal
deleted
inserted
replaced
25075:d1bd0fd07ee6 | 25076:14bf7679fb68 |
---|---|
54 #define PyString_AsDecodedString PyUnicode_AsDecodedUnicode | 54 #define PyString_AsDecodedString PyUnicode_AsDecodedUnicode |
55 /* #define PyString_AsStringAndSize */ | 55 /* #define PyString_AsStringAndSize */ |
56 #define _PyString_InsertThousandsGrouping _PyUnicode_InsertThousandsGrouping | 56 #define _PyString_InsertThousandsGrouping _PyUnicode_InsertThousandsGrouping |
57 | 57 |
58 #endif /* PY_MAJOR_VERSION */ | 58 #endif /* PY_MAJOR_VERSION */ |
59 | |
60 /* Backports from 2.6 */ | |
61 #if PY_VERSION_HEX < 0x02060000 | |
62 | |
63 #define Py_TYPE(ob) (ob)->ob_type | |
64 #define Py_SIZE(ob) (ob)->ob_size | |
65 #define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, | |
66 | |
67 /* Shamelessly stolen from bytesobject.h */ | |
68 #define PyBytesObject PyStringObject | |
69 #define PyBytes_Type PyString_Type | |
70 | |
71 #define PyBytes_Check PyString_Check | |
72 #define PyBytes_CheckExact PyString_CheckExact | |
73 #define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED | |
74 #define PyBytes_AS_STRING PyString_AS_STRING | |
75 #define PyBytes_GET_SIZE PyString_GET_SIZE | |
76 #define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS | |
77 | |
78 #define PyBytes_FromStringAndSize PyString_FromStringAndSize | |
79 #define PyBytes_FromString PyString_FromString | |
80 #define PyBytes_FromFormatV PyString_FromFormatV | |
81 #define PyBytes_FromFormat PyString_FromFormat | |
82 #define PyBytes_Size PyString_Size | |
83 #define PyBytes_AsString PyString_AsString | |
84 #define PyBytes_Repr PyString_Repr | |
85 #define PyBytes_Concat PyString_Concat | |
86 #define PyBytes_ConcatAndDel PyString_ConcatAndDel | |
87 #define _PyBytes_Resize _PyString_Resize | |
88 #define _PyBytes_Eq _PyString_Eq | |
89 #define PyBytes_Format PyString_Format | |
90 #define _PyBytes_FormatLong _PyString_FormatLong | |
91 #define PyBytes_DecodeEscape PyString_DecodeEscape | |
92 #define _PyBytes_Join _PyString_Join | |
93 #define PyBytes_Decode PyString_Decode | |
94 #define PyBytes_Encode PyString_Encode | |
95 #define PyBytes_AsEncodedObject PyString_AsEncodedObject | |
96 #define PyBytes_AsEncodedString PyString_AsEncodedString | |
97 #define PyBytes_AsDecodedObject PyString_AsDecodedObject | |
98 #define PyBytes_AsDecodedString PyString_AsDecodedString | |
99 #define PyBytes_AsStringAndSize PyString_AsStringAndSize | |
100 #define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping | |
101 | |
102 #endif /* PY_VERSION_HEX */ | |
103 | 59 |
104 #ifdef _WIN32 | 60 #ifdef _WIN32 |
105 #ifdef _MSC_VER | 61 #ifdef _MSC_VER |
106 /* msvc 6.0 has problems */ | 62 /* msvc 6.0 has problems */ |
107 #define inline __inline | 63 #define inline __inline |