merge 3.4-slp (Stackless python#70)

Author: Anselm Kruis

Stackless/core/stackless_impl.h

@@ -558,7 +558,7 @@ PyObject * slp_get_channel_callback(void);
 #define STACKLESS_ASSERT() assert(1)
 
 #define STACKLESS_RETVAL(obj) (obj)
-#define STACKLESS_ASSERT_UNWINDING_VALUE_IS_NOT(val) assert(1)
+#define STACKLESS_ASSERT_UNWINDING_VALUE_IS_NOT(obj, val) assert(1)
 
 #define STACKLESS_DECLARE_METHOD(type, meth)