Stackless issue python#185: preliminarily resolve the name collision

caused by the previous merge commit.

Move the definition of struct _stackless_runtime_state from
stackless_structs.h to stackless_tstate.h and remove the include of
stackless_structs.h from pystate.h. Resolve conflicts/warnigs caused
by including "platf/slp_platformselect.h" into stackless_tstate.h

Unfortunately the new test for subinterpreters still fails.

Author: Anselm Kruis

Include/internal/pystate.h

@@ -11,7 +11,6 @@ extern "C" {
 #include "internal/mem.h"
 #include "internal/ceval.h"
 #include "internal/warnings.h"
-#include "core/stackless_structs.h"
 
 
 /* GIL state */

Modules/_pickle.c

@@ -11,6 +11,7 @@
 #ifdef STACKLESS
 #define SLP_BUILD_CORE
 #include "core/stackless_impl.h"
+#include "platf/slp_platformselect.h" /* for stack saving */
 /* rename these because otherwise we will conflict with windows.h */
 #define FLOAT OP_FLOAT
 #define INT OP_INT

Stackless/core/stackless_impl.h

@@ -691,7 +691,6 @@ int slp_schedule_task(PyObject **result,
 void slp_thread_unblock(PyThreadState *ts);
 
 int slp_initialize_main_and_current(void);
-void slp_initialize(struct _stackless_runtime_state *);
 
 /* setting the tasklet's tempval, optimized for no change */
 

Stackless/core/stackless_structs.h

@@ -9,7 +9,6 @@ extern "C" {
 #define SLP_BUILD_CORE
 #endif
 
-#include "platf/slp_platformselect.h"
 #include "frameobject.h"
 
 #ifdef STACKLESS
@@ -261,39 +260,6 @@ PyAPI_DATA(PyTypeObject) PyChannel_Type;
 #define PyChannel_Check(op) PyObject_TypeCheck(op, &PyChannel_Type)
 #define PyChannel_CheckExact(op) (Py_TYPE(op) == PyChannel_TypePtr)
 
-/*
- * Stackless runtime state
- *
- * Initialized by
- * void slp_initialize(struct _stackless_runtime_state * state)
- * in stackless_util.c
- */
-struct _stackless_runtime_state {
-    /*
-     * flag whether the next call should try to be stackless.
-     * The protocol is: This flag may be only set if the called
-     * thing supports it. It doesn't matter whether it uses the
-     * chance, but it *must* set it to zero before returning.
-     * This flags in a way serves as a parameter that we don't have.
-     *
-     * As long as the GIL is shared between sub-interpreters,
-     * try_stackless can be a field in the runtime state.
-     */
-    int try_stackless;
-
-    /* Used to manage free C-stack objects, see stacklesseval.c */
-    int cstack_cachecount;
-    PyCStackObject *cstack_cache[CSTACK_SLOTS];
-
-    /*
-     * Used during a hard switch.
-     */
-    struct {
-        PyCStackObject **cstprev;
-        PyCStackObject *cst;
-        PyTaskletObject *prev;
-    } transfer;
-};
 
 #else /* #ifdef SLP_BUILD_CORE */
 

Stackless/core/stackless_tstate.h

@@ -1,5 +1,9 @@
 #ifndef Py_LIMITED_API
 
+#ifdef Py_BUILD_CORE
+#include "platf/slp_platformselect.h"
+#endif
+
 /*** addition to tstate ***/
 #ifdef Py_DEBUG
 #ifndef SLP_WITH_FRAME_REF_DEBUG
@@ -178,5 +182,41 @@ void slp_kill_tasks_with_stacks(struct _ts *tstate);
     tstate->st.thread.is_blocked = 0; \
     tstate->st.thread.is_idle = 0;
 
+/*
+ * Stackless runtime state
+ *
+ * Initialized by
+ * void slp_initialize(struct _stackless_runtime_state * state)
+ * in stackless_util.c
+ */
+struct _stackless_runtime_state {
+    /*
+     * flag whether the next call should try to be stackless.
+     * The protocol is: This flag may be only set if the called
+     * thing supports it. It doesn't matter whether it uses the
+     * chance, but it *must* set it to zero before returning.
+     * This flags in a way serves as a parameter that we don't have.
+     *
+     * As long as the GIL is shared between sub-interpreters,
+     * try_stackless can be a field in the runtime state.
+     */
+    int try_stackless;
+
+    /* Used to manage free C-stack objects, see stacklesseval.c */
+    int cstack_cachecount;
+    struct _cstack *cstack_cache[CSTACK_SLOTS];
+
+    /*
+     * Used during a hard switch.
+     */
+    struct {
+        struct _cstack **cstprev;
+        struct _cstack *cst;
+        struct _tasklet *prev;
+    } transfer;
+};
+
+void slp_initialize(struct _stackless_runtime_state *);
+
 #endif /* #ifdef Py_BUILD_CORE */
 #endif /* #ifndef Py_LIMITED_API */

Stackless/module/_teststackless.c

@@ -17,6 +17,9 @@
 
 #include "Python.h"
 #include "stackless_api.h"
+#ifdef MS_WINDOWS
+#include "malloc.h" /* for alloca */
+#endif
 
  /******************************************************
 

Stackless/platf/switch_x64_msvc.h

@@ -44,7 +44,6 @@
 #define STACKLESS_SPY
 
 #ifdef IMPLEMENT_STACKLESSMODULE
-#include "Windows.h"
 #define CANNOT_READ_MEM(p, bytes) IsBadReadPtr(p, bytes)
 
 static int IS_ON_STACK(void*p)

Stackless/platf/switch_x86_msvc.h

@@ -24,17 +24,6 @@
 
 #define SLP_USE_NATIVE_BITFIELD_LAYOUT 1
 
-/* for the SEH things */
-#ifndef _WINDOWS_
-#define WIN32_LEAN_AND_MEAN
-#ifdef BYTE
-#undef BYTE
-#endif
-#ifdef Yield
-#undef Yield /* remove definition from Python_ast.h to avoid conflict */
-#endif
-#include <windows.h>
-#endif
 #define _SEH32
 
 #define alloca _alloca
@@ -80,7 +69,6 @@ slp_switch(void)
 #define STACKLESS_SPY
 
 #ifdef IMPLEMENT_STACKLESSMODULE
-#include "Windows.h"
 #define CANNOT_READ_MEM(p, bytes) IsBadReadPtr(p, bytes)
 
 static int IS_ON_STACK(void*p)