Stackless issue #264: Move Stackless includes to Include/cpython

Move Include/slp_exttype.h, Include/slp_structs.h and
Include/stackless_version.h to Include/cpython/.

Author: Anselm Kruis

Include/cpython/object.h

@@ -7,7 +7,7 @@ extern "C" {
 #endif
 
 #ifdef STACKLESS
-#include "slp_exttype.h"
+#include "cpython/slp_exttype.h"
 #endif
 
 /********************* String Literals ****************************************/

Include/slp_exttype.h renamed to Include/cpython/slp_exttype.h

@@ -38,7 +38,7 @@ extern "C" {
 
 #ifdef STACKLESS
 
-#include "slp_structs.h"
+#include "cpython/slp_structs.h"
 
 /*
  * create a new tasklet object.

Include/slp_structs.h renamed to Include/cpython/slp_structs.h

@@ -1081,9 +1081,10 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/weakrefobject.h \
 		$(srcdir)/Include/stackless.h \
 		$(srcdir)/Include/stackless_api.h \
-		$(srcdir)/Include/stackless_version.h \
-		$(srcdir)/Include/slp_structs.h \
+		$(srcdir)/Include/cpython/stackless_version.h \
+		$(srcdir)/Include/cpython/slp_exttype.h \
 		$(srcdir)/Include/cpython/slp_tstate.h \
+		$(srcdir)/Include/cpython/slp_structs.h \
 		$(srcdir)/Include/internal/pycore_stackless.h \
 		$(srcdir)/Include/internal/pycore_slp_pystate.h \
 		$(srcdir)/Include/internal/pycore_slp_prickelpit.h \

Include/stackless_version.h renamed to Include/cpython/stackless_version.h

@@ -231,8 +231,9 @@
     <ClInclude Include="..\Python\importdl.h" />
     <ClInclude Include="..\Python\thread_nt.h" />
     <ClInclude Include="..\Python\wordcode_helpers.h" />
-    <ClInclude Include="..\Include\slp_exttype.h" />
-    <ClInclude Include="..\Include\slp_structs.h" />
+    <ClInclude Include="..\Include\cpython\stackless_version.h" />
+    <ClInclude Include="..\Include\cpython\slp_exttype.h" />
+    <ClInclude Include="..\Include\cpython\slp_structs.h" />
     <ClInclude Include="..\Include\cpython\slp_tstate.h" />
     <ClInclude Include="..\Include\internal\pycore_stackless.h" />
     <ClInclude Include="..\Include\internal\pycore_slp_pystate.h" />
@@ -242,7 +243,6 @@
     <ClInclude Include="..\Include\internal\pycore_slp_switch_x86_msvc.h" />
     <ClInclude Include="..\Include\stackless.h" />
     <ClInclude Include="..\Include\stackless_api.h" />
-    <ClInclude Include="..\Include\stackless_version.h" />
   </ItemGroup>
   <ItemGroup Condition="$(IncludeExternals)">
     <ClInclude Include="$(zlibDir)\crc32.h" />

Include/stackless_api.h

@@ -507,13 +507,13 @@
     <ClInclude Include="..\Include\stackless_api.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\stackless_version.h">
+    <ClInclude Include="..\Include\cpython\stackless_version.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\slp_exttype.h">
+    <ClInclude Include="..\Include\cpython\slp_exttype.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\slp_structs.h">
+    <ClInclude Include="..\Include\cpython\slp_structs.h">
       <Filter>Include</Filter>
     </ClInclude>
     <ClInclude Include="..\Include\cpython\slp_tstate.h">

Makefile.pre.in

@@ -7,7 +7,7 @@
 
 #ifdef STACKLESS
         /* avoiding to recompile everything for Stackless all the time */
-#include "stackless_version.h"
+#include "cpython/stackless_version.h"
 
 const char *
 Py_GetVersion(void)

PCbuild/pythoncore.vcxproj

@@ -24,8 +24,9 @@ What's New in Stackless 3.X.X?
   from outside of the interpreter (with no main-tasklet).
 
 - https://github.com/stackless-dev/stackless/issues/264
-  Implement bpo-35134 for Stackless: move header Include/slp_tstate.h to
-  Include/cpython/slp_tstate.h.
+  Implement bpo-35134 for Stackless: move header Include/slp_tstate.h,
+  Include/slp_exttype.h, Include/slp_structs.h and Include/stackless_version.h
+  to Include/cpython/.
 
 - https://github.com/stackless-dev/stackless/issues/263
   Implement bpo-35081 for Stackless: Prefix header files in Include/internal/