From 866f62d0c035d16de8e7aa1b5a7dfe48a2af405d Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Sat, 10 May 2008 16:15:26 +0200 Subject: [PATCH] more #define's for stuff that's gone in Py3 --- Cython/Compiler/ModuleNode.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py index 27882058..0481e3cc 100644 --- a/Cython/Compiler/ModuleNode.py +++ b/Cython/Compiler/ModuleNode.py @@ -367,6 +367,9 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): code.putln("#ifndef PY_LONG_LONG") code.putln(" #define PY_LONG_LONG LONG_LONG") code.putln("#endif") + code.putln("#ifndef DL_EXPORT") + code.putln(" #define DL_EXPORT(t) t") + code.putln("#endif") code.putln("#if PY_VERSION_HEX < 0x02040000") code.putln(" #define METH_COEXIST 0") code.putln("#endif") @@ -397,6 +400,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): code.putln("#endif") code.putln("#if PY_MAJOR_VERSION >= 3") + code.putln(" #define PyInt_Type PyLong_Type") code.putln(" #define PyInt_Check(op) PyLong_Check(op)") code.putln(" #define PyInt_CheckExact(op) PyLong_CheckExact(op)") code.putln(" #define PyInt_FromString PyLong_FromString") @@ -411,6 +415,10 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): code.putln(" #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask") code.putln("#endif") + code.putln("#if PY_MAJOR_VERSION >= 3") + code.putln(" #define PyBaseString_Type PyUnicode_Type") + code.putln("#endif") + code.putln("#if PY_MAJOR_VERSION >= 3") code.putln(" #define PyMethod_New(func, self, klass) (func!=NULL?(Py_INCREF(func),func):NULL)") code.putln("#endif") -- 2.26.2