Merge branch '0.22.x'

4ac974de · Stefan Behnel · 723e6ada · a3a44506 · 4ac974de
Commit 4ac974de authored Apr 11, 2015 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Cython/Utility/ModuleSetupCode.c Cython/Utility/ModuleSetupCode.c +4 -0

No files found.
--- a/Cython/Utility/ModuleSetupCode.c
+++ b/Cython/Utility/ModuleSetupCode.c
@@ -106,6 +106,10 @@
      PyNumber_Add(a, b) : __Pyx_PyUnicode_Concat(a, b))
 #endif

+#if CYTHON_COMPILING_IN_PYPY && !defined(PyUnicode_Contains)
+  #define PyUnicode_Contains(u, s)  PySequence_Contains(u, s)
+#endif
+
 #define __Pyx_PyString_FormatSafe(a, b)   ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : __Pyx_PyString_Format(a, b))
 #define __Pyx_PyUnicode_FormatSafe(a, b)  ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : PyUnicode_Format(a, b))