Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
15a40e21
Commit
15a40e21
authored
Oct 15, 2016
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avoid potential conflict with typedefed name in CPython
parent
929101da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
Cython/Utility/ModuleSetupCode.c
Cython/Utility/ModuleSetupCode.c
+4
-2
Cython/Utility/ObjectHandling.c
Cython/Utility/ObjectHandling.c
+3
-3
No files found.
Cython/Utility/ModuleSetupCode.c
View file @
15a40e21
...
@@ -196,8 +196,10 @@
...
@@ -196,8 +196,10 @@
#ifndef METH_FASTCALL
#ifndef METH_FASTCALL
// new in CPython 3.6
// new in CPython 3.6
#define METH_FASTCALL 0x80
#define METH_FASTCALL 0x80
typedef
PyObject
*
(
*
_PyCFunctionFast
)
(
PyObject
*
self
,
PyObject
**
args
,
typedef
PyObject
*
(
*
__Pyx_PyCFunctionFast
)
(
PyObject
*
self
,
PyObject
**
args
,
Py_ssize_t
nargs
,
PyObject
*
kwnames
);
Py_ssize_t
nargs
,
PyObject
*
kwnames
);
#else
#define __Pyx_PyCFunctionFast _PyCFunctionFast
#endif
#endif
#if CYTHON_FAST_PYCCALL
#if CYTHON_FAST_PYCCALL
#define __Pyx_PyFastCFunction_Check(func) \
#define __Pyx_PyFastCFunction_Check(func) \
...
...
Cython/Utility/ObjectHandling.c
View file @
15a40e21
...
@@ -1143,7 +1143,7 @@ static PyObject* __Pyx__CallUnboundCMethod0(__Pyx_CachedCFunction* cfunc, PyObje
...
@@ -1143,7 +1143,7 @@ static PyObject* __Pyx__CallUnboundCMethod0(__Pyx_CachedCFunction* cfunc, PyObje
(likely((cfunc)->flag == METH_NOARGS) ? (*((cfunc)->func))(self, NULL) : \
(likely((cfunc)->flag == METH_NOARGS) ? (*((cfunc)->func))(self, NULL) : \
(likely((cfunc)->flag == (METH_VARARGS | METH_KEYWORDS)) ? ((*(PyCFunctionWithKeywords)(cfunc)->func)(self, $empty_tuple, NULL)) : \
(likely((cfunc)->flag == (METH_VARARGS | METH_KEYWORDS)) ? ((*(PyCFunctionWithKeywords)(cfunc)->func)(self, $empty_tuple, NULL)) : \
((cfunc)->flag == METH_VARARGS ? (*((cfunc)->func))(self, $empty_tuple) : \
((cfunc)->flag == METH_VARARGS ? (*((cfunc)->func))(self, $empty_tuple) : \
(PY_VERSION_HEX >= 0x030600B1 && (cfunc)->flag == METH_FASTCALL ? (*(_PyCFunctionFast)(cfunc)->func)(self, &PyTuple_GET_ITEM($empty_tuple, 0), 0, NULL) : \
(PY_VERSION_HEX >= 0x030600B1 && (cfunc)->flag == METH_FASTCALL ? (*(_
_Pyx_
PyCFunctionFast)(cfunc)->func)(self, &PyTuple_GET_ITEM($empty_tuple, 0), 0, NULL) : \
__Pyx__CallUnboundCMethod0(cfunc, self))))) : \
__Pyx__CallUnboundCMethod0(cfunc, self))))) : \
__Pyx__CallUnboundCMethod0(cfunc, self))
__Pyx__CallUnboundCMethod0(cfunc, self))
#else
#else
...
@@ -1181,7 +1181,7 @@ static PyObject* __Pyx__CallUnboundCMethod1(__Pyx_CachedCFunction* cfunc, PyObje
...
@@ -1181,7 +1181,7 @@ static PyObject* __Pyx__CallUnboundCMethod1(__Pyx_CachedCFunction* cfunc, PyObje
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) \
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) \
((likely((cfunc)->func && (cfunc)->flag == METH_O)) ? (*((cfunc)->func))(self, arg) : \
((likely((cfunc)->func && (cfunc)->flag == METH_O)) ? (*((cfunc)->func))(self, arg) : \
((PY_VERSION_HEX >= 0x030600B1 && (cfunc)->func && (cfunc)->flag == METH_FASTCALL) ? \
((PY_VERSION_HEX >= 0x030600B1 && (cfunc)->func && (cfunc)->flag == METH_FASTCALL) ? \
(*(_PyCFunctionFast)(cfunc)->func)(self, &arg, 1, NULL) : \
(*(_
_Pyx_
PyCFunctionFast)(cfunc)->func)(self, &arg, 1, NULL) : \
__Pyx__CallUnboundCMethod1(cfunc, self, arg)))
__Pyx__CallUnboundCMethod1(cfunc, self, arg)))
#else
#else
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) __Pyx__CallUnboundCMethod1(cfunc, self, arg)
#define __Pyx_CallUnboundCMethod1(cfunc, self, arg) __Pyx__CallUnboundCMethod1(cfunc, self, arg)
...
@@ -1652,7 +1652,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, P
...
@@ -1652,7 +1652,7 @@ static CYTHON_INLINE PyObject * __Pyx_PyCFunction_FastCall(PyObject *func_obj, P
caller loses its exception */
caller loses its exception */
assert
(
!
PyErr_Occurred
());
assert
(
!
PyErr_Occurred
());
return
(
*
((
_PyCFunctionFast
)
meth
))
(
self
,
args
,
nargs
,
NULL
);
return
(
*
((
_
_Pyx_
PyCFunctionFast
)
meth
))
(
self
,
args
,
nargs
,
NULL
);
}
}
#endif // CYTHON_FAST_PYCCALL
#endif // CYTHON_FAST_PYCCALL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment