gh-148829: Move sentinelobject.h to Include/cpython/ (#149186)

This C API is not part of the limited C API, so move it to the
CPython C API.

diff --git a/Include/Python.h b/Include/Python.h
index 1272e2464f91d1e2347e77c7a40f7eeaf62df5cc..d5e38b8b0201eec62a6ac724e7f7dcb465773610 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -117,7 +117,7 @@ __pragma(warning(disable: 4201))
 #include "cpython/genobject.h"
 #include "descrobject.h"
 #include "genericaliasobject.h"
-#include "sentinelobject.h"
+#include "cpython/sentinelobject.h"
 #include "warnings.h"
 #include "weakrefobject.h"
 #include "structseq.h"

diff --git a/Include/sentinelobject.h b/Include/cpython/sentinelobject.h
similarity index 93%
rename from Include/sentinelobject.h
rename to Include/cpython/sentinelobject.h
index 9d8577767b748520e71141ee38ce20fbe7df653e..0b6ff0f17e6f8c146bb27a1db22b3af3ed2228f5 100644 (file)
--- a/Include/sentinelobject.h
+++ b/Include/cpython/sentinelobject.h
@@ -1,12 +1,12 @@
 /* Sentinel object interface */
 
+#ifndef Py_LIMITED_API
 #ifndef Py_SENTINELOBJECT_H
 #define Py_SENTINELOBJECT_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef Py_LIMITED_API
 PyAPI_DATA(PyTypeObject) PySentinel_Type;
 
 #define PySentinel_Check(op) Py_IS_TYPE((op), &PySentinel_Type)
@@ -14,9 +14,9 @@ PyAPI_DATA(PyTypeObject) PySentinel_Type;
 PyAPI_FUNC(PyObject *) PySentinel_New(
     const char *name,
     const char *module_name);
-#endif
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* !Py_SENTINELOBJECT_H */
+#endif /* !Py_LIMITED_API */

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2ce53c6a8162128a2200767b40dc22b2b59ea2a4..0edf55d991a05e9c476c4bd40e46adfa8eaef2e3 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1241,7 +1241,6 @@ PYTHON_HEADERS= \
                $(srcdir)/Include/pytypedefs.h \
                $(srcdir)/Include/rangeobject.h \
                $(srcdir)/Include/refcount.h \
-               $(srcdir)/Include/sentinelobject.h \
                $(srcdir)/Include/setobject.h \
                $(srcdir)/Include/sliceobject.h \
                $(srcdir)/Include/structmember.h \
@@ -1309,6 +1308,7 @@ PYTHON_HEADERS= \
                $(srcdir)/Include/cpython/pystats.h \
                $(srcdir)/Include/cpython/pythonrun.h \
                $(srcdir)/Include/cpython/pythread.h \
+               $(srcdir)/Include/cpython/sentinelobject.h \
                $(srcdir)/Include/cpython/setobject.h \
                $(srcdir)/Include/cpython/sliceobject.h \
                $(srcdir)/Include/cpython/structseq.h \

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index fb9217fee8bd737e5d3f5afc65eca291edeffe95..fae4a90b4536fcbb042bc31fb5074183299b53ec 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -195,6 +195,7 @@
     <ClInclude Include="..\Include\cpython\pystats.h" />
     <ClInclude Include="..\Include\cpython\pythonrun.h" />
     <ClInclude Include="..\Include\cpython\pythread.h" />
+    <ClInclude Include="..\Include\cpython\sentinelobject.h" />
     <ClInclude Include="..\Include\cpython\setobject.h" />
     <ClInclude Include="..\Include\cpython\sliceobject.h" />
     <ClInclude Include="..\Include\cpython\structseq.h" />
@@ -384,7 +385,6 @@
     <ClInclude Include="..\Include\pytypedefs.h" />
     <ClInclude Include="..\Include\rangeobject.h" />
     <ClInclude Include="..\Include\refcount.h" />
-    <ClInclude Include="..\Include\sentinelobject.h" />
     <ClInclude Include="..\Include\setobject.h" />
     <ClInclude Include="..\Include\sliceobject.h" />
     <ClInclude Include="..\Include\structmember.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 1e1d085cd75511efe34ad8bdaf5787905a698f50..04b6641ae30e7f8c06bddbabfd625de56e8327aa 100644 (file)
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -222,9 +222,6 @@
     <ClInclude Include="..\Include\runtime_structs.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\sentinelobject.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\setobject.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -522,6 +519,9 @@
     <ClInclude Include="..\Include\cpython\pythread.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\cpython\sentinelobject.h">
+      <Filter>Include</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\cpython\setobject.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>