[GR-51961] Keep our C file structure closer to CPython, part 2

PullRequest: graalpython/3197

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/abstract.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -729,11 +729,13 @@ PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
 #define PySequence_Fast_GET_ITEM(o, i)\
      (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
 
-PyAPI_FUNC(PyObject **) _PySequence_Fast_ITEMS(PyObject *o);
+// GraalPy-specific
+PyAPI_FUNC(PyObject **) PyTruffleSequence_Fast_ITEMS(PyObject *o);
 
 /* Return a pointer to the underlying item array for
    an object returned by PySequence_Fast */
-#define PySequence_Fast_ITEMS(sf) _PySequence_Fast_ITEMS(sf)
+// GraalPy change
+#define PySequence_Fast_ITEMS(sf) PyTruffleSequence_Fast_ITEMS(sf)
 
 /* Return the number of occurrences on value on 'o', that is, return
    the number of keys for which o[key] == value.

graalpython/com.oracle.graal.python.cext/include/cpython/abstract.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -178,11 +178,13 @@ PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t);
 
 /* === Sequence protocol ================================================ */
 
-PyAPI_FUNC(PyObject*) _PySequence_ITEM(PyObject* obj, Py_ssize_t index);
+// GraalPy-specific
+PyAPI_FUNC(PyObject*) PyTruffleSequence_ITEM(PyObject* obj, Py_ssize_t index);
 
 /* Assume tp_as_sequence and sq_item exist and that 'i' does not
    need to be corrected for a negative index. */
-#define PySequence_ITEM(o, i) _PySequence_ITEM((o), (i))
+// GraalPy change
+#define PySequence_ITEM(o, i) PyTruffleSequence_ITEM((o), (i))
 
 #define PY_ITERSEARCH_COUNT    1
 #define PY_ITERSEARCH_INDEX    2