[Python-checkins] python/dist/src/Python ceval.c,2.349,2.350 pystate.c,2.22,2.23

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv6893/Python

Modified Files:
	ceval.c pystate.c 
Log Message:
- PyEval_GetFrame() is now declared to return a PyFrameObject *
  instead of a plain PyObject *.  (SF patch #686601 by Ben Laurie.)


Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.349
retrieving revision 2.350
diff -C2 -d -r2.349 -r2.350
*** ceval.c	10 Feb 2003 08:21:08 -0000	2.349
--- ceval.c	19 Feb 2003 15:53:16 -0000	2.350
***************
*** 3078,3082 ****
  PyEval_GetBuiltins(void)
  {
! 	PyFrameObject *current_frame = (PyFrameObject *)PyEval_GetFrame();
  	if (current_frame == NULL)
  		return PyThreadState_Get()->interp->builtins;
--- 3078,3082 ----
  PyEval_GetBuiltins(void)
  {
! 	PyFrameObject *current_frame = PyEval_GetFrame();
  	if (current_frame == NULL)
  		return PyThreadState_Get()->interp->builtins;
***************
*** 3088,3092 ****
  PyEval_GetLocals(void)
  {
! 	PyFrameObject *current_frame = (PyFrameObject *)PyEval_GetFrame();
  	if (current_frame == NULL)
  		return NULL;
--- 3088,3092 ----
  PyEval_GetLocals(void)
  {
! 	PyFrameObject *current_frame = PyEval_GetFrame();
  	if (current_frame == NULL)
  		return NULL;
***************
*** 3098,3102 ****
  PyEval_GetGlobals(void)
  {
! 	PyFrameObject *current_frame = (PyFrameObject *)PyEval_GetFrame();
  	if (current_frame == NULL)
  		return NULL;
--- 3098,3102 ----
  PyEval_GetGlobals(void)
  {
! 	PyFrameObject *current_frame = PyEval_GetFrame();
  	if (current_frame == NULL)
  		return NULL;
***************
*** 3105,3113 ****
  }
  
! PyObject *
  PyEval_GetFrame(void)
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	return _PyThreadState_GetFrame((PyObject *)tstate);
  }
  
--- 3105,3113 ----
  }
  
! PyFrameObject *
  PyEval_GetFrame(void)
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	return _PyThreadState_GetFrame(tstate);
  }
  
***************
*** 3115,3119 ****
  PyEval_GetRestricted(void)
  {
! 	PyFrameObject *current_frame = (PyFrameObject *)PyEval_GetFrame();
  	return current_frame == NULL ? 0 : current_frame->f_restricted;
  }
--- 3115,3119 ----
  PyEval_GetRestricted(void)
  {
! 	PyFrameObject *current_frame = PyEval_GetFrame();
  	return current_frame == NULL ? 0 : current_frame->f_restricted;
  }
***************
*** 3122,3126 ****
  PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
  {
! 	PyFrameObject *current_frame = (PyFrameObject *)PyEval_GetFrame();
  	int result = cf->cf_flags != 0;
  
--- 3122,3126 ----
  PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
  {
! 	PyFrameObject *current_frame = PyEval_GetFrame();
  	int result = cf->cf_flags != 0;
  

Index: pystate.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pystate.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** pystate.c	8 Nov 2002 12:53:11 -0000	2.22
--- pystate.c	19 Feb 2003 15:53:17 -0000	2.23
***************
*** 36,40 ****
  
  PyThreadState *_PyThreadState_Current = NULL;
! unaryfunc _PyThreadState_GetFrame = NULL;
  
  
--- 36,40 ----
  
  PyThreadState *_PyThreadState_Current = NULL;
! PyThreadFrameGetter _PyThreadState_GetFrame = NULL;
  
  
***************
*** 127,131 ****
  	PyThreadState *tstate = PyMem_NEW(PyThreadState, 1);
  	if (_PyThreadState_GetFrame == NULL)
! 		_PyThreadState_GetFrame = (unaryfunc)threadstate_getframe;
  
  	if (tstate != NULL) {
--- 127,131 ----
  	PyThreadState *tstate = PyMem_NEW(PyThreadState, 1);
  	if (_PyThreadState_GetFrame == NULL)
! 		_PyThreadState_GetFrame = threadstate_getframe;
  
  	if (tstate != NULL) {