post merge fix

qunaibit · qunaibit · commit 5942bfefb382 · 2025-05-28T02:49:54.000+03:00
diff --git a/graalpython/com.oracle.graal.python.cext/src/typeobject.c b/graalpython/com.oracle.graal.python.cext/src/typeobject.c
@@ -10206,7 +10206,6 @@ recurse_down_subclasses(PyTypeObject *type, PyObject *attr_name,
     }
     return 0;
 }
-#endif // GraalPy change
 
 static int
 expect_manually_inherited(PyTypeObject *type, void **slot)
@@ -10285,6 +10284,7 @@ expect_manually_inherited(PyTypeObject *type, void **slot)
     /* It must be inherited (see type_ready_inherit()).. */
     return 0;
 }
+#endif // GraalPy change
 
 /* This function is called by PyType_Ready() to populate the type's
    dictionary with method descriptors for function slots.  For each

Original file line number	Diff line number	Diff line change
`@@ -10206,7 +10206,6 @@ recurse_down_subclasses(PyTypeObject type, PyObject attr_name,`
`10206`	`10206`	`}`
`10207`	`10207`	`return 0;`
`10208`	`10208`	`}`
`10209`		`-#endif // GraalPy change`
`10210`	`10209`
`10211`	`10210`	`static int`
`10212`	`10211`	`expect_manually_inherited(PyTypeObject type, void *slot)`
`@@ -10285,6 +10284,7 @@ expect_manually_inherited(PyTypeObject type, void *slot)`
`10285`	`10284`	`/* It must be inherited (see type_ready_inherit()).. */`
`10286`	`10285`	`return 0;`
`10287`	`10286`	`}`
	`10287`	`+#endif // GraalPy change`
`10288`	`10288`
`10289`	`10289`	`/* This function is called by PyType_Ready() to populate the type's`
`10290`	`10290`	`dictionary with method descriptors for function slots. For each`