[Python-checkins] python/dist/src/Include Python.h, 2.63, 2.64 ceval.h, 2.51, 2.52 genobject.h, 2.1, 2.2

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14461/Include

Modified Files:
	Python.h ceval.h genobject.h 
Log Message:
Patch #966493: Cleanup generator/eval_frame exposure.


Index: Python.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Python.h,v
retrieving revision 2.63
retrieving revision 2.64
diff -C2 -d -r2.63 -r2.64
*** Python.h	8 Jun 2004 18:52:41 -0000	2.63
--- Python.h	27 Jun 2004 15:43:12 -0000	2.64
***************
*** 100,103 ****
--- 100,104 ----
  #include "cellobject.h"
  #include "iterobject.h"
+ #include "genobject.h"
  #include "descrobject.h"
  #include "weakrefobject.h"

Index: ceval.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -d -r2.51 -r2.52
*** ceval.h	1 Jun 2004 15:22:40 -0000	2.51
--- ceval.h	27 Jun 2004 15:43:12 -0000	2.52
***************
*** 65,69 ****
  
  PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *);
! PyAPI_FUNC(PyObject *) PyEval_EvaluateFrame(PyObject *);
  
  /* this used to be handled on a per-thread basis - now just two globals */
--- 65,69 ----
  
  PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *);
! PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
  
  /* this used to be handled on a per-thread basis - now just two globals */

Index: genobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/genobject.h,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** genobject.h	1 Jun 2004 15:22:40 -0000	2.1
--- genobject.h	27 Jun 2004 15:43:12 -0000	2.2
***************
*** 8,16 ****
  #endif
  
  typedef struct {
  	PyObject_HEAD
  	/* The gi_ prefix is intended to remind of generator-iterator. */
  
! 	PyFrameObject *gi_frame;
  
  	/* True if generator is being executed. */
--- 8,18 ----
  #endif
  
+ struct _frame; /* Avoid including frameobject.h */
+ 
  typedef struct {
  	PyObject_HEAD
  	/* The gi_ prefix is intended to remind of generator-iterator. */
  
! 	struct _frame *gi_frame;
  
  	/* True if generator is being executed. */
***************
*** 26,30 ****
  #define PyGen_CheckExact(op) ((op)->ob_type == &PyGen_Type)
  
! PyAPI_FUNC(PyObject *) PyGen_New(PyFrameObject *);
  
  #ifdef __cplusplus
--- 28,32 ----
  #define PyGen_CheckExact(op) ((op)->ob_type == &PyGen_Type)
  
! PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *);
  
  #ifdef __cplusplus