Stackless issue #149: Consolidate stateful runtime globals.

bpo-30860 consolidates global variables. This requires minor changes in
Stackless header files. Now Stackless compiles.
We still need to consolidate Stackless specific global variables.

Author: Anselm Kruis

Makefile.pre.in

@@ -908,7 +908,7 @@ regen-typeslots:
 		$(srcdir)/Objects/typeslots.inc
 
 Stackless/core/slp_transfer.o: $(srcdir)/Stackless/core/slp_transfer.c
-		$(CC) -c $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(SLPFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Stackless/core/slp_transfer.c
+		$(CC) -c $(PY_CORE_CFLAGS) $(SLPFLAGS) -o $@ $(srcdir)/Stackless/core/slp_transfer.c
 
 ############################################################################
 # Header files

Stackless/core/stackless_impl.h

@@ -3,12 +3,16 @@
 
 #include "Python.h"
 
-#ifdef STACKLESS
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef STACKLESS
+
+#ifdef Py_BUILD_CORE
+#include "internal/pystate.h"
+#endif
+
 #include "structmember.h"
 #include "compile.h"
 #include "frameobject.h"