Stackless issue python#205: fix building with STACKLESS_OFF

The recent changes broke building with STACKLESS_OFF
(Usually $ make CFLAGS=-DSTACKLESS_OFF).
Now it works again.

Author: Anselm Kruis

Modules/_asynciomodule.c

@@ -2546,13 +2546,13 @@ static PyStacklessFunctionDeclarationObject task_step_impl_declaration = {
 static PyObject *
 task_step_impl_part1(TaskObj *task, PyObject *exc, int *failed)
 {
-    STACKLESS_GETARG();
 #else  /* #ifdef STACKLESS */
 
 static PyObject *
 task_step_impl(TaskObj *task, PyObject *exc)
 {
 #endif  /* #ifdef STACKLESS */
+    STACKLESS_GETARG();
     int res;
     int clear_exc = 0;
     PyObject *result = NULL;

Stackless/core/stackless_impl.h

@@ -3,18 +3,18 @@
 
 #include "Python.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef STACKLESS
-
 #if defined(Py_BUILD_CORE) && !defined(SLP_BUILD_CORE)
 #define SLP_BUILD_CORE
 #endif
 
 #include "stackless_api.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef STACKLESS
+
 #ifdef SLP_BUILD_CORE
 
 #ifdef Py_BUILD_CORE
@@ -781,6 +781,8 @@ long slp_parse_thread_id(PyObject *thread_id, unsigned long *id);
 #define SLP_PEEK_NEXT_FRAME(tstate) \
     ((tstate)->frame)
 
+#define STACKLESS_PROMOTE_WRAPPER(descr) assert(1)
+
 #define STACKLESS_PROPOSE(tstate, func) assert(1)
 #define STACKLESS_PROPOSE_FLAG(tstate, flag) assert(1)
 #define STACKLESS_PROPOSE_ALL(tstate) assert(1)

Stackless/pickling/prickelpit.h

@@ -3,6 +3,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef STACKLESS
 
 /******************************************************
 
@@ -66,7 +67,7 @@ int slp_safe_pickling(int(*save)(PyObject *, PyObject *, int),
                      int pers_save);
 
 
-
+#endif /* STACKLESS */
 #ifdef __cplusplus
 }
 #endif

Stackless/stackless_api.h

@@ -468,16 +468,6 @@ STACKLESS_RETRACT()
 #define STACKLESS_PROMOTE_FLAG(flag) \
     (stackless ? (_PyStackless_TRY_STACKLESS = (flag)) : 0)
 
-#define STACKLESS_PROMOTE_METHOD(obj, slot_name) \
-    STACKLESS_PROMOTE_FLAG( \
-        (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_EXTENSION) && \
-        Py_TYPE(obj)->tp_as_mapping && \
-                Py_TYPE(obj)->tp_as_mapping->slpflags.slot_name)
-
-#define STACKLESS_PROMOTE(obj) \
-    STACKLESS_PROMOTE_FLAG( \
-        Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_CALL)
-
 #define STACKLESS_RETRACT() (_PyStackless_TRY_STACKLESS = 0)
 
 #define STACKLESS_ASSERT() assert(!_PyStackless_TRY_STACKLESS)
@@ -490,6 +480,18 @@ STACKLESS_RETRACT()
 #define STACKLESS_RETRACT() assert(1)
 #define STACKLESS_ASSERT() assert(1)
 #endif
+
+#define STACKLESS_PROMOTE_METHOD(obj, slot_name) \
+    STACKLESS_PROMOTE_FLAG( \
+        (Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_EXTENSION) && \
+        Py_TYPE(obj)->tp_as_mapping && \
+                Py_TYPE(obj)->tp_as_mapping->slpflags.slot_name)
+
+#define STACKLESS_PROMOTE(obj) \
+    STACKLESS_PROMOTE_FLAG( \
+        Py_TYPE(obj)->tp_flags & Py_TPFLAGS_HAVE_STACKLESS_CALL)
+
+
 #ifdef STACKLESS
 
 /******************************************************