os_python.h (pymol-v1.8.6.0.tar.bz2) | : | os_python.h (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 56 | skipping to change at line 56 | |||
# define PyString_Check PyUnicode_Check | # define PyString_Check PyUnicode_Check | |||
# define PyString_Size PyUnicode_GetLength | # define PyString_Size PyUnicode_GetLength | |||
# define PyString_GET_SIZE PyUnicode_GetLength | # define PyString_GET_SIZE PyUnicode_GetLength | |||
# define PyString_FromString PyUnicode_FromString | # define PyString_FromString PyUnicode_FromString | |||
# define PyString_FromStringAndSize PyUnicode_FromStringAndSize | # define PyString_FromStringAndSize PyUnicode_FromStringAndSize | |||
# define PyString_InternFromString PyUnicode_InternFromString | # define PyString_InternFromString PyUnicode_InternFromString | |||
# define PyString_AsString PyUnicode_AsUTF8 | # define PyString_AsString PyUnicode_AsUTF8 | |||
# define PyString_AS_STRING PyUnicode_AsUTF8 | # define PyString_AS_STRING PyUnicode_AsUTF8 | |||
# define PyCObject_AsVoidPtr(capsule) PyCapsule_GetPointer(capsule, "name") | # define PyCObject_AsVoidPtr(capsule) PyCapsule_GetPointer(capsule, "name") | |||
# define PyCObject_FromVoidPtr(p, d) PyCapsule_New(p, "name", (PyCapsule_Dest | // Warning: PyCObject_FromVoidPtr destructor takes `void* p` argument, | |||
ructor) d) | // but PyCapsule_New destructor takes `PyObject* capsule` argument! | |||
// The "capsulethunk.h" documentation is wrong about using the same destructor. | ||||
# define PyCObject_FromVoidPtr(p, d) PyCapsule_New(p, "name", NULL) | ||||
# define PyCObject_Check PyCapsule_CheckExact | # define PyCObject_Check PyCapsule_CheckExact | |||
# define PyEval_EvalCode(o, ...) PyEval_EvalCode((PyObject*)o, __VA_ARGS_ _) | # define PyEval_EvalCode(o, ...) PyEval_EvalCode((PyObject*)o, __VA_ARGS_ _) | |||
# define Py_TPFLAGS_HAVE_ITER 0 | # define Py_TPFLAGS_HAVE_ITER 0 | |||
#endif | #endif | |||
/* | /* | |||
* For compatibility with the pickletools, this type represents | * For compatibility with the pickletools, this type represents | |||
* an optionally owned C string and has to be returned by value. | * an optionally owned C string and has to be returned by value. | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |