[Stackless-checkins] r50698 - in stackless/trunk: Objects/exceptions.c Python/sysmodule.c

[richard.tew]

Author: richard.tew
Date: Tue Jul 18 15:24:18 2006
New Revision: 50698

Modified:
   stackless/trunk/Objects/exceptions.c
   stackless/trunk/Python/sysmodule.c
Log:
Two fixes so that the source code will compile as normal Python, when STACKLESS is undefined.  The first removes all reference to Tasklet exit in this case in exceptions.c, and the second allows the subversion version numbering to work with the stackless SVN path whether STACKLESS or STACKLESS_OFF are defined (so note, if compiling normal Python with the Stackless branch, do not undefine STACKLESS, but rather change the define to define STACKLESS_OFF instead).

Modified: stackless/trunk/Objects/exceptions.c
==============================================================================
--- stackless/trunk/Objects/exceptions.c	(original)
+++ stackless/trunk/Objects/exceptions.c	Tue Jul 18 15:24:18 2006
@@ -2077,7 +2077,9 @@
     POST_INIT(TypeError)
     POST_INIT(StopIteration)
     POST_INIT(GeneratorExit)
+#ifdef STACKLESS
     POST_INIT(TaskletExit)
+#endif
     POST_INIT(SystemExit)
     POST_INIT(KeyboardInterrupt)
     POST_INIT(ImportError)

Modified: stackless/trunk/Python/sysmodule.c
==============================================================================
--- stackless/trunk/Python/sysmodule.c	(original)
+++ stackless/trunk/Python/sysmodule.c	Tue Jul 18 15:24:18 2006
@@ -981,7 +981,7 @@
 	if (svn_initialized)
 		return;
 
-#ifdef STACKLESS
+#if defined(STACKLESS) || defined(STACKLESS_OFF)
 	python = strstr(headurl, "/stackless/");
 #else
 	python = strstr(headurl, "/python/");

_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins