merge

Cython/Compiler/ExprNodes.py

@@ -4092,6 +4092,7 @@ static INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
 type_cache_invalidation_code = [
 """
 #if PY_VERSION_HEX >= 0x02060000
+/* #define __Pyx_TypeModified(t) PyType_Modified(t) */  /* Py3.0beta1 */
 static void __Pyx_TypeModified(PyTypeObject* type); /*proto*/
 #else
   #define __Pyx_TypeModified(t)

Cython/Compiler/ModuleNode.py

@@ -424,6 +424,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
         code.putln("#endif")
 
         code.putln("#if PY_MAJOR_VERSION >= 3")
+        code.putln("  #include \"stringobject.h\"") # Py3 compat header for PyString_*()
         code.putln("  #define PyBaseString_Type            PyUnicode_Type")
         code.putln("  #define PyInt_Type                   PyLong_Type")
         code.putln("  #define PyInt_Check(op)              PyLong_Check(op)")