[Python-checkins] CVS: python/dist/src/Include abstract.h,2.20,2.21 bufferobject.h,2.4,2.5 classobject.h,2.30,2.31 cobject.h,2.7,2.8 compile.h,2.21,2.22 complexobject.h,2.6,2.7 fileobject.h,2.19,2.20 floatobject.h,2.15,2.16 frameobject.h,2.26,2.27 funcobject.h,2.18,2.19 grammar.h,2.12,2.13 intobject.h,2.19,2.20 listobject.h,2.19,2.20 methodobject.h,2.18,2.19

Sat, 8 Jul 2000 17:20:39 -0700

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv15720
Modified Files:
	abstract.h bufferobject.h classobject.h cobject.h compile.h 
	complexobject.h fileobject.h floatobject.h frameobject.h 
	funcobject.h grammar.h intobject.h listobject.h methodobject.h 
Log Message:
ANSI-fication and Py_PROTO extermination.
Index: abstract.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/abstract.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** abstract.h	2000年06月30日 23:58:04	2.20
--- abstract.h	2000年07月09日 00:20:36	2.21
***************
*** 234,238 ****
 #define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)

! DL_IMPORT(int) PyObject_Cmp Py_PROTO((PyObject *o1, PyObject *o2, int *result));

 /*
--- 234,238 ----
 #define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL)

! DL_IMPORT(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result);

 /*
***************
*** 282,286 ****
 */

! DL_IMPORT(int) PyCallable_Check Py_PROTO((PyObject *o));

 /*
--- 282,286 ----
 */

! DL_IMPORT(int) PyCallable_Check(PyObject *o);

 /*
***************
*** 294,299 ****

! DL_IMPORT(PyObject *) PyObject_CallObject Py_PROTO((PyObject *callable_object,
! 					 PyObject *args));

 /*
--- 294,299 ----

! DL_IMPORT(PyObject *) PyObject_CallObject(PyObject *callable_object,
! PyObject *args);

 /*
***************
*** 307,312 ****
 */

! DL_IMPORT(PyObject *) PyObject_CallFunction Py_PROTO((PyObject *callable_object,
! 					 char *format, ...));

 /*
--- 307,312 ----
 */

! DL_IMPORT(PyObject *) PyObject_CallFunction(PyObject *callable_object,
! char *format, ...);

 /*
***************
*** 321,326 ****

! DL_IMPORT(PyObject *) PyObject_CallMethod Py_PROTO((PyObject *o, char *m,
! 					 char *format, ...));

 /*
--- 321,326 ----

! DL_IMPORT(PyObject *) PyObject_CallMethod(PyObject *o, char *m,
! char *format, ...);

 /*
***************
*** 374,378 ****
 */

! DL_IMPORT(PyObject *) PyObject_Type Py_PROTO((PyObject *o));

 /*
--- 374,378 ----
 */

! DL_IMPORT(PyObject *) PyObject_Type(PyObject *o);

 /*
***************
*** 382,386 ****
 */

! DL_IMPORT(int) PyObject_Length Py_PROTO((PyObject *o));

 /*
--- 382,386 ----
 */

! DL_IMPORT(int) PyObject_Length(PyObject *o);

 /*
***************
*** 392,396 ****
 */

! DL_IMPORT(PyObject *) PyObject_GetItem Py_PROTO((PyObject *o, PyObject *key));

 /*
--- 392,396 ----
 */

! DL_IMPORT(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key);

 /*
***************
*** 401,405 ****
 */

! DL_IMPORT(int) PyObject_SetItem Py_PROTO((PyObject *o, PyObject *key, PyObject *v));

 /*
--- 401,405 ----
 */

! DL_IMPORT(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v);

 /*
***************
*** 409,413 ****
 */

! DL_IMPORT(int) PyObject_DelItem Py_PROTO((PyObject *o, PyObject *key));

 /*
--- 409,413 ----
 */

! DL_IMPORT(int) PyObject_DelItem(PyObject *o, PyObject *key);

 /*
***************
*** 465,469 ****
 /* Number Protocol:*/

! DL_IMPORT(int) PyNumber_Check Py_PROTO((PyObject *o));

 /*
--- 465,469 ----
 /* Number Protocol:*/

! DL_IMPORT(int) PyNumber_Check(PyObject *o);

 /*
***************
*** 475,479 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Add Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 475,479 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2);

 /*
***************
*** 484,488 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Subtract Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 484,488 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2);

 /*
***************
*** 493,497 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Multiply Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 493,497 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2);

 /*
***************
*** 503,507 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Divide Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 503,507 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2);

 /*
***************
*** 512,516 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Remainder Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 512,516 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2);

 /*
***************
*** 522,526 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Divmod Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 522,526 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2);

 /*
***************
*** 532,536 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Power Py_PROTO((PyObject *o1, PyObject *o2, PyObject *o3));

 /*
--- 532,537 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2,
! PyObject *o3);

 /*
***************
*** 541,545 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Negative Py_PROTO((PyObject *o));

 /*
--- 542,546 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Negative(PyObject *o);

 /*
***************
*** 549,553 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Positive Py_PROTO((PyObject *o));

 /*
--- 550,554 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Positive(PyObject *o);

 /*
***************
*** 557,561 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Absolute Py_PROTO((PyObject *o));

 /*
--- 558,562 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Absolute(PyObject *o);

 /*
***************
*** 565,569 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Invert Py_PROTO((PyObject *o));

 /*
--- 566,570 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Invert(PyObject *o);

 /*
***************
*** 575,579 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Lshift Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 576,580 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2);

 /*
***************
*** 585,589 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Rshift Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 586,590 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2);

 /*
***************
*** 594,598 ****
 */

! DL_IMPORT(PyObject *) PyNumber_And Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 595,599 ----
 */

! DL_IMPORT(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2);

 /*
***************
*** 604,608 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Xor Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 605,609 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2);

 /*
***************
*** 614,618 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Or Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 615,619 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2);

 /*
***************
*** 642,646 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Int Py_PROTO((PyObject *o));

 /*
--- 643,647 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Int(PyObject *o);

 /*
***************
*** 651,655 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Long Py_PROTO((PyObject *o));

 /*
--- 652,656 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Long(PyObject *o);

 /*
***************
*** 660,664 ****
 */

! DL_IMPORT(PyObject *) PyNumber_Float Py_PROTO((PyObject *o));

 /*
--- 661,665 ----
 */

! DL_IMPORT(PyObject *) PyNumber_Float(PyObject *o);

 /*
***************
*** 671,675 ****
 /* Sequence protocol:*/

! DL_IMPORT(int) PySequence_Check Py_PROTO((PyObject *o));

 /*
--- 672,676 ----
 /* Sequence protocol:*/

! DL_IMPORT(int) PySequence_Check(PyObject *o);

 /*
***************
*** 681,685 ****
 */

! DL_IMPORT(int) PySequence_Length Py_PROTO((PyObject *o));

 /*
--- 682,686 ----
 */

! DL_IMPORT(int) PySequence_Length(PyObject *o);

 /*
***************
*** 688,692 ****
 */

! DL_IMPORT(PyObject *) PySequence_Concat Py_PROTO((PyObject *o1, PyObject *o2));

 /*
--- 689,693 ----
 */

! DL_IMPORT(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2);

 /*
***************
*** 697,701 ****
 */

! DL_IMPORT(PyObject *) PySequence_Repeat Py_PROTO((PyObject *o, int count));

 /*
--- 698,702 ----
 */

! DL_IMPORT(PyObject *) PySequence_Repeat(PyObject *o, int count);

 /*
***************
*** 706,710 ****
 */

! DL_IMPORT(PyObject *) PySequence_GetItem Py_PROTO((PyObject *o, int i));

 /*
--- 707,711 ----
 */

! DL_IMPORT(PyObject *) PySequence_GetItem(PyObject *o, int i);

 /*
***************
*** 713,717 ****
 */

! DL_IMPORT(PyObject *) PySequence_GetSlice Py_PROTO((PyObject *o, int i1, int i2));

 /*
--- 714,718 ----
 */

! DL_IMPORT(PyObject *) PySequence_GetSlice(PyObject *o, int i1, int i2);

 /*
***************
*** 722,726 ****
 */

! DL_IMPORT(int) PySequence_SetItem Py_PROTO((PyObject *o, int i, PyObject *v));

 /*
--- 723,727 ----
 */

! DL_IMPORT(int) PySequence_SetItem(PyObject *o, int i, PyObject *v);

 /*
***************
*** 731,735 ****
 */

! DL_IMPORT(int) PySequence_DelItem Py_PROTO((PyObject *o, int i));

 /*
--- 732,736 ----
 */

! DL_IMPORT(int) PySequence_DelItem(PyObject *o, int i);

 /*
***************
*** 739,743 ****
 */

! DL_IMPORT(int) PySequence_SetSlice Py_PROTO((PyObject *o, int i1, int i2, PyObject *v));

 /*
--- 740,745 ----
 */

! DL_IMPORT(int) PySequence_SetSlice(PyObject *o, int i1, int i2,
! PyObject *v);

 /*
***************
*** 747,751 ****
 */

! DL_IMPORT(int) PySequence_DelSlice Py_PROTO((PyObject *o, int i1, int i2));

 /*
--- 749,753 ----
 */

! DL_IMPORT(int) PySequence_DelSlice(PyObject *o, int i1, int i2);

 /*
***************
*** 755,759 ****
 */

! DL_IMPORT(PyObject *) PySequence_Tuple Py_PROTO((PyObject *o));

 /*
--- 757,761 ----
 */

! DL_IMPORT(PyObject *) PySequence_Tuple(PyObject *o);

 /*
***************
*** 763,767 ****

! DL_IMPORT(PyObject *) PySequence_List Py_PROTO((PyObject *o));

 /*
--- 765,769 ----

! DL_IMPORT(PyObject *) PySequence_List(PyObject *o);

 /*
***************
*** 770,774 ****
 */

! DL_IMPORT(PyObject *) PySequence_Fast Py_PROTO((PyObject *o, const char* m));

 /*
--- 772,776 ----
 */

! DL_IMPORT(PyObject *) PySequence_Fast(PyObject *o, const char* m);

 /*
***************
*** 789,793 ****
 */

! DL_IMPORT(int) PySequence_Count Py_PROTO((PyObject *o, PyObject *value));

 /*
--- 791,795 ----
 */

! DL_IMPORT(int) PySequence_Count(PyObject *o, PyObject *value);

 /*
***************
*** 798,806 ****
 */

! DL_IMPORT(int) PySequence_Contains Py_PROTO((PyObject *o, PyObject *value));

 /* For DLL-level backwards compatibility */
 #undef PySequence_In
! DL_IMPORT(int) PySequence_In Py_PROTO((PyObject *o, PyObject *value));

 /* For source-level backwards compatibility */
--- 800,808 ----
 */

! DL_IMPORT(int) PySequence_Contains(PyObject *o, PyObject *value);

 /* For DLL-level backwards compatibility */
 #undef PySequence_In
! DL_IMPORT(int) PySequence_In(PyObject *o, PyObject *value);

 /* For source-level backwards compatibility */
***************
*** 813,817 ****
 */

! DL_IMPORT(int) PySequence_Index Py_PROTO((PyObject *o, PyObject *value));

 /*
--- 815,819 ----
 */

! DL_IMPORT(int) PySequence_Index(PyObject *o, PyObject *value);

 /*
***************
*** 823,827 ****
 /* Mapping protocol:*/

! DL_IMPORT(int) PyMapping_Check Py_PROTO((PyObject *o));

 /*
--- 825,829 ----
 /* Mapping protocol:*/

! DL_IMPORT(int) PyMapping_Check(PyObject *o);

 /*
***************
*** 832,836 ****
 */

! DL_IMPORT(int) PyMapping_Length Py_PROTO((PyObject *o));

 /*
--- 834,838 ----
 */

! DL_IMPORT(int) PyMapping_Length(PyObject *o);

 /*
***************
*** 842,846 ****
 /* implemented as a macro:

! int PyMapping_DelItemString Py_PROTO((PyObject *o, char *key));

 	 Remove the mapping for object, key, from the object *o.
--- 844,848 ----
 /* implemented as a macro:

! int PyMapping_DelItemString(PyObject *o, char *key);

 	 Remove the mapping for object, key, from the object *o.
***************
*** 852,856 ****
 /* implemented as a macro:

! int PyMapping_DelItem Py_PROTO((PyObject *o, PyObject *key));

 	 Remove the mapping for object, key, from the object *o.
--- 854,858 ----
 /* implemented as a macro:

! int PyMapping_DelItem(PyObject *o, PyObject *key);

 	 Remove the mapping for object, key, from the object *o.
***************
*** 860,864 ****
 #define PyMapping_DelItem(O,K) PyDict_DelItem((O),(K))

! DL_IMPORT(int) PyMapping_HasKeyString Py_PROTO((PyObject *o, char *key));

 /*
--- 862,866 ----
 #define PyMapping_DelItem(O,K) PyDict_DelItem((O),(K))

! DL_IMPORT(int) PyMapping_HasKeyString(PyObject *o, char *key);

 /*
***************
*** 870,874 ****
 */

! DL_IMPORT(int) PyMapping_HasKey Py_PROTO((PyObject *o, PyObject *key));

 /*
--- 872,876 ----
 */

! DL_IMPORT(int) PyMapping_HasKey(PyObject *o, PyObject *key);

 /*
***************
*** 913,917 ****
 #define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL)

! DL_IMPORT(PyObject *) PyMapping_GetItemString Py_PROTO((PyObject *o, char *key));

 /*
--- 915,919 ----
 #define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL)

! DL_IMPORT(PyObject *) PyMapping_GetItemString(PyObject *o, char *key);

 /*
***************
*** 921,926 ****
 */

! DL_IMPORT(int) PyMapping_SetItemString Py_PROTO((PyObject *o, char *key,
! 					 PyObject *value));

 /*
--- 923,928 ----
 */

! DL_IMPORT(int) PyMapping_SetItemString(PyObject *o, char *key,
! PyObject *value);

 /*
Index: bufferobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/bufferobject.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** bufferobject.h	2000年06月30日 23:58:04	2.4
--- bufferobject.h	2000年07月09日 00:20:36	2.5
***************
*** 1,8 ****
- #ifndef Py_BUFFEROBJECT_H
- #define Py_BUFFEROBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 19,22 ****
--- 13,22 ----
 /* Note: the object's structure is private */

+ #ifndef Py_BUFFEROBJECT_H
+ #define Py_BUFFEROBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 

 extern DL_IMPORT(PyTypeObject) PyBuffer_Type;
***************
*** 26,36 ****
 #define Py_END_OF_BUFFER	(-1)

! extern DL_IMPORT(PyObject *) PyBuffer_FromObject Py_PROTO((PyObject *base, int offset, int size));
! extern DL_IMPORT(PyObject *) PyBuffer_FromReadWriteObject Py_PROTO((PyObject *base, int offset, int size));

! extern DL_IMPORT(PyObject *) PyBuffer_FromMemory Py_PROTO((void *ptr, int size));
! extern DL_IMPORT(PyObject *) PyBuffer_FromReadWriteMemory Py_PROTO((void *ptr, int size));

! extern DL_IMPORT(PyObject *) PyBuffer_New Py_PROTO((int size));

 #ifdef __cplusplus
--- 26,39 ----
 #define Py_END_OF_BUFFER	(-1)

! extern DL_IMPORT(PyObject *) PyBuffer_FromObject(PyObject *base,
! int offset, int size);
! extern DL_IMPORT(PyObject *) PyBuffer_FromReadWriteObject(PyObject *base,
! int offset,
! int size);

! extern DL_IMPORT(PyObject *) PyBuffer_FromMemory(void *ptr, int size);
! extern DL_IMPORT(PyObject *) PyBuffer_FromReadWriteMemory(void *ptr, int size);

! extern DL_IMPORT(PyObject *) PyBuffer_New(int size);

 #ifdef __cplusplus
***************
*** 38,40 ****
 #endif
 #endif /* !Py_BUFFEROBJECT_H */
- 
--- 41,42 ----
Index: classobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/classobject.h,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** classobject.h	2000年06月30日 23:58:04	2.30
--- classobject.h	2000年07月09日 00:20:36	2.31
***************
*** 1,8 ****
- #ifndef Py_CLASSOBJECT_H
- #define Py_CLASSOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 19,44 ****
 /* Revealing some structures (not for general use) */

 typedef struct {
! 	PyObject_HEAD
! 	PyObject	*cl_bases;	/* A tuple of class objects */
! 	PyObject	*cl_dict;	/* A dictionary */
! 	PyObject	*cl_name;	/* A string */
! 	/* The following three are functions or NULL */
! 	PyObject	*cl_getattr;
! 	PyObject	*cl_setattr;
! 	PyObject	*cl_delattr;
 } PyClassObject;

 typedef struct {
! 	PyObject_HEAD
! 	PyClassObject	*in_class;	/* The class object */
! 	PyObject	*in_dict;	/* A dictionary */
 } PyInstanceObject;

 typedef struct {
! 	PyObject_HEAD
! 	PyObject *im_func; /* The callable object implementing the method */
! 	PyObject *im_self; /* The instance it is bound to, or NULL */
! 	PyObject *im_class; /* The class that defined the method */
 } PyMethodObject;

--- 13,44 ----
 /* Revealing some structures (not for general use) */

+ #ifndef Py_CLASSOBJECT_H
+ #define Py_CLASSOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! PyObject_HEAD
! PyObject	*cl_bases;	/* A tuple of class objects */
! PyObject	*cl_dict;	/* A dictionary */
! PyObject	*cl_name;	/* A string */
! /* The following three are functions or NULL */
! PyObject	*cl_getattr;
! PyObject	*cl_setattr;
! PyObject	*cl_delattr;
 } PyClassObject;

 typedef struct {
! PyObject_HEAD
! PyClassObject *in_class;	/* The class object */
! PyObject	 *in_dict;	/* A dictionary */
 } PyInstanceObject;

 typedef struct {
! PyObject_HEAD
! PyObject *im_func; /* The callable object implementing the method */
! PyObject *im_self; /* The instance it is bound to, or NULL */
! PyObject *im_class; /* The class that defined the method */
 } PyMethodObject;

***************
*** 49,59 ****
 #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)

! extern DL_IMPORT(PyObject *) PyClass_New Py_PROTO((PyObject *, PyObject *, PyObject *));
! extern DL_IMPORT(PyObject *) PyInstance_New Py_PROTO((PyObject *, PyObject *, PyObject *));
! extern DL_IMPORT(PyObject *) PyMethod_New Py_PROTO((PyObject *, PyObject *, PyObject *));
! 
! extern DL_IMPORT(PyObject *) PyMethod_Function Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyMethod_Self Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyMethod_Class Py_PROTO((PyObject *));

 /* Macros for direct access to these values. Type checks are *not*
--- 49,60 ----
 #define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type)

! extern DL_IMPORT(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *);
! extern DL_IMPORT(PyObject *) PyInstance_New(PyObject *, PyObject *,
! PyObject *);
! extern DL_IMPORT(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *);
! 
! extern DL_IMPORT(PyObject *) PyMethod_Function(PyObject *);
! extern DL_IMPORT(PyObject *) PyMethod_Self(PyObject *);
! extern DL_IMPORT(PyObject *) PyMethod_Class(PyObject *);

 /* Macros for direct access to these values. Type checks are *not*
***************
*** 66,75 ****
 	(((PyMethodObject *)meth) -> im_class)

! extern DL_IMPORT(int) PyClass_IsSubclass Py_PROTO((PyObject *, PyObject *));

! extern DL_IMPORT(PyObject *) PyInstance_DoBinOp
! 	Py_PROTO((PyObject *, PyObject *,
! 		 char *, char *,
! 		 PyObject * (*) Py_PROTO((PyObject *, PyObject *)) ));

 #ifdef __cplusplus
--- 67,76 ----
 	(((PyMethodObject *)meth) -> im_class)

! extern DL_IMPORT(int) PyClass_IsSubclass(PyObject *, PyObject *);

! extern DL_IMPORT(PyObject *) PyInstance_DoBinOp(PyObject *, PyObject *,
! char *, char *,
! PyObject * (*)(PyObject *,
! PyObject *));

 #ifdef __cplusplus
Index: cobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/cobject.h,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -r2.7 -r2.8
*** cobject.h	2000年06月30日 23:58:04	2.7
--- cobject.h	2000年07月09日 00:20:36	2.8
***************
*** 1,8 ****
- #ifndef Py_COBJECT_H
- #define Py_COBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 24,27 ****
--- 18,27 ----
 */

+ #ifndef Py_COBJECT_H
+ #define Py_COBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 extern DL_IMPORT(PyTypeObject) PyCObject_Type;

***************
*** 35,39 ****
 */
 extern DL_IMPORT(PyObject *)
! PyCObject_FromVoidPtr Py_PROTO((void *cobj, void (*destruct)(void*)));

--- 35,39 ----
 */
 extern DL_IMPORT(PyObject *)
! PyCObject_FromVoidPtr(void *cobj, void (*destruct)(void*));

***************
*** 44,61 ****
 */
 extern DL_IMPORT(PyObject *)
! PyCObject_FromVoidPtrAndDesc Py_PROTO((void *cobj, void *desc,
! void (*destruct)(void*,void*)));

 /* Retrieve a pointer to a C object from a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_AsVoidPtr Py_PROTO((PyObject *));

 /* Retrieve a pointer to a description object from a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_GetDesc Py_PROTO((PyObject *));

 /* Import a pointer to a C object from a module using a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_Import Py_PROTO((char *module_name, char *cobject_name));

 #ifdef __cplusplus
--- 44,61 ----
 */
 extern DL_IMPORT(PyObject *)
! PyCObject_FromVoidPtrAndDesc(void *cobj, void *desc,
! void (*destruct)(void*,void*));

 /* Retrieve a pointer to a C object from a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_AsVoidPtr(PyObject *);

 /* Retrieve a pointer to a description object from a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_GetDesc(PyObject *);

 /* Import a pointer to a C object from a module using a PyCObject. */
 extern DL_IMPORT(void *)
! PyCObject_Import(char *module_name, char *cobject_name);

 #ifdef __cplusplus
Index: compile.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/compile.h,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** compile.h	2000年06月30日 23:58:04	2.21
--- compile.h	2000年07月09日 00:20:36	2.22
***************
*** 1,8 ****
- #ifndef Py_COMPILE_H
- #define Py_COMPILE_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,36 ****
 /* Definitions for bytecode */

 /* Bytecode object */
 typedef struct {
! 	PyObject_HEAD
! 	int co_argcount;	/* #arguments, except *args */
! 	int co_nlocals;		/* #local variables */
! 	int co_stacksize;	/* #entries needed for evaluation stack */
! 	int co_flags;		/* CO_..., see below */
! 	PyObject *co_code;	/* instruction opcodes */
! 	PyObject *co_consts;	/* list (constants used) */
! 	PyObject *co_names;	/* list of strings (names used) */
! 	PyObject *co_varnames;	/* tuple of strings (local variable names) */
! 	/* The rest doesn't count for hash/cmp */
! 	PyObject *co_filename;	/* string (where it was loaded from) */
! 	PyObject *co_name;	/* string (name, for reference) */
! 	int co_firstlineno;	/* first source line number */
! 	PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) */
 } PyCodeObject;

--- 11,36 ----
 /* Definitions for bytecode */

+ #ifndef Py_COMPILE_H
+ #define Py_COMPILE_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 /* Bytecode object */
 typedef struct {
! PyObject_HEAD
! int co_argcount;		/* #arguments, except *args */
! int co_nlocals;		/* #local variables */
! int co_stacksize;		/* #entries needed for evaluation stack */
! int co_flags;		/* CO_..., see below */
! PyObject *co_code;		/* instruction opcodes */
! PyObject *co_consts;	/* list (constants used) */
! PyObject *co_names;		/* list of strings (names used) */
! PyObject *co_varnames;	/* tuple of strings (local variable names) */
! /* The rest doesn't count for hash/cmp */
! PyObject *co_filename;	/* string (where it was loaded from) */
! PyObject *co_name;		/* string (name, for reference) */
! int co_firstlineno;		/* first source line number */
! PyObject *co_lnotab;	/* string (encoding addr<->lineno mapping) */
 } PyCodeObject;

***************
*** 49,57 ****
 /* Public interface */
 struct _node; /* Declare the existence of this type */
! DL_IMPORT(PyCodeObject *) PyNode_Compile Py_PROTO((struct _node *, char *));
! DL_IMPORT(PyCodeObject *) PyCode_New Py_PROTO((
 	int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
! 	PyObject *, PyObject *, int, PyObject *)); /* same as struct above */
! DL_IMPORT(int) PyCode_Addr2Line Py_PROTO((PyCodeObject *, int));

 /* for internal use only */
--- 49,57 ----
 /* Public interface */
 struct _node; /* Declare the existence of this type */
! DL_IMPORT(PyCodeObject *) PyNode_Compile(struct _node *, char *);
! DL_IMPORT(PyCodeObject *) PyCode_New(
 	int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *,
! 	PyObject *, PyObject *, int, PyObject *); /* same as struct above */
! DL_IMPORT(int) PyCode_Addr2Line(PyCodeObject *, int);

 /* for internal use only */
Index: complexobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/complexobject.h,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** complexobject.h	1998年12月04日 18:47:56	2.6
--- complexobject.h	2000年07月09日 00:20:36	2.7
***************
*** 1,2 ****
--- 1,4 ----
+ /* Complex number structure */
+ 
 #ifndef COMPLEXOBJECT_H
 #define COMPLEXOBJECT_H
***************
*** 5,13 ****
 #endif

- /* Complex number structure */
- 
 typedef struct {
! double real;
! double imag;
 } Py_complex;

--- 7,13 ----
 #endif

 typedef struct {
! double real;
! double imag;
 } Py_complex;

***************
*** 21,30 ****
 #define c_pow _Py_c_pow

! extern DL_IMPORT(Py_complex) c_sum Py_PROTO((Py_complex, Py_complex));
! extern DL_IMPORT(Py_complex) c_diff Py_PROTO((Py_complex, Py_complex));
! extern DL_IMPORT(Py_complex) c_neg Py_PROTO((Py_complex));
! extern DL_IMPORT(Py_complex) c_prod Py_PROTO((Py_complex, Py_complex));
! extern DL_IMPORT(Py_complex) c_quot Py_PROTO((Py_complex, Py_complex));
! extern DL_IMPORT(Py_complex) c_pow Py_PROTO((Py_complex, Py_complex));

--- 21,30 ----
 #define c_pow _Py_c_pow

! extern DL_IMPORT(Py_complex) c_sum(Py_complex, Py_complex);
! extern DL_IMPORT(Py_complex) c_diff(Py_complex, Py_complex);
! extern DL_IMPORT(Py_complex) c_neg(Py_complex);
! extern DL_IMPORT(Py_complex) c_prod(Py_complex, Py_complex);
! extern DL_IMPORT(Py_complex) c_quot(Py_complex, Py_complex);
! extern DL_IMPORT(Py_complex) c_pow(Py_complex, Py_complex);

***************
*** 37,42 ****

 typedef struct {
! 	PyObject_HEAD
! 	Py_complex cval;
 } PyComplexObject; 

--- 37,42 ----

 typedef struct {
! PyObject_HEAD
! Py_complex cval;
 } PyComplexObject; 

***************
*** 45,54 ****
 #define PyComplex_Check(op) ((op)->ob_type == &PyComplex_Type)

! extern DL_IMPORT(PyObject *) PyComplex_FromCComplex Py_PROTO((Py_complex));
! extern DL_IMPORT(PyObject *) PyComplex_FromDoubles Py_PROTO((double real, double imag));

! extern DL_IMPORT(double) PyComplex_RealAsDouble Py_PROTO((PyObject *op));
! extern DL_IMPORT(double) PyComplex_ImagAsDouble Py_PROTO((PyObject *op));
! extern DL_IMPORT(Py_complex) PyComplex_AsCComplex Py_PROTO((PyObject *op));

 #ifdef __cplusplus
--- 45,54 ----
 #define PyComplex_Check(op) ((op)->ob_type == &PyComplex_Type)

! extern DL_IMPORT(PyObject *) PyComplex_FromCComplex(Py_complex);
! extern DL_IMPORT(PyObject *) PyComplex_FromDoubles(double real, double imag);

! extern DL_IMPORT(double) PyComplex_RealAsDouble(PyObject *op);
! extern DL_IMPORT(double) PyComplex_ImagAsDouble(PyObject *op);
! extern DL_IMPORT(Py_complex) PyComplex_AsCComplex(PyObject *op);

 #ifdef __cplusplus
Index: fileobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/fileobject.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** fileobject.h	2000年06月30日 23:58:04	2.19
--- fileobject.h	2000年07月09日 00:20:36	2.20
***************
*** 1,8 ****
- #ifndef Py_FILEOBJECT_H
- #define Py_FILEOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,34 ****
 /* File object interface */

 extern DL_IMPORT(PyTypeObject) PyFile_Type;

 #define PyFile_Check(op) ((op)->ob_type == &PyFile_Type)

! extern DL_IMPORT(PyObject *) PyFile_FromString Py_PROTO((char *, char *));
! extern DL_IMPORT(void) PyFile_SetBufSize Py_PROTO((PyObject *, int));
! extern DL_IMPORT(PyObject *) PyFile_FromFile
! 	Py_PROTO((FILE *, char *, char *, int (*)Py_FPROTO((FILE *))));
! extern DL_IMPORT(FILE *) PyFile_AsFile Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyFile_Name Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyFile_GetLine Py_PROTO((PyObject *, int));
! extern DL_IMPORT(int) PyFile_WriteObject Py_PROTO((PyObject *, PyObject *, int));
! extern DL_IMPORT(int) PyFile_SoftSpace Py_PROTO((PyObject *, int));
! extern DL_IMPORT(int) PyFile_WriteString Py_PROTO((char *, PyObject *));

 #ifdef __cplusplus
--- 11,34 ----
 /* File object interface */

+ #ifndef Py_FILEOBJECT_H
+ #define Py_FILEOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 extern DL_IMPORT(PyTypeObject) PyFile_Type;

 #define PyFile_Check(op) ((op)->ob_type == &PyFile_Type)

! extern DL_IMPORT(PyObject *) PyFile_FromString(char *, char *);
! extern DL_IMPORT(void) PyFile_SetBufSize(PyObject *, int);
! extern DL_IMPORT(PyObject *) PyFile_FromFile(FILE *, char *, char *,
! int (*)(FILE *));
! extern DL_IMPORT(FILE *) PyFile_AsFile(PyObject *);
! extern DL_IMPORT(PyObject *) PyFile_Name(PyObject *);
! extern DL_IMPORT(PyObject *) PyFile_GetLine(PyObject *, int);
! extern DL_IMPORT(int) PyFile_WriteObject(PyObject *, PyObject *, int);
! extern DL_IMPORT(int) PyFile_SoftSpace(PyObject *, int);
! extern DL_IMPORT(int) PyFile_WriteString(char *, PyObject *);

 #ifdef __cplusplus
Index: floatobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/floatobject.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** floatobject.h	2000年06月30日 23:58:04	2.15
--- floatobject.h	2000年07月09日 00:20:36	2.16
***************
*** 1,8 ****
- #ifndef Py_FLOATOBJECT_H
- #define Py_FLOATOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 21,27 ****
 */

 typedef struct {
! 	PyObject_HEAD
! 	double ob_fval;
 } PyFloatObject;

--- 15,27 ----
 */

+ #ifndef Py_FLOATOBJECT_H
+ #define Py_FLOATOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! PyObject_HEAD
! double ob_fval;
 } PyFloatObject;

***************
*** 30,36 ****
 #define PyFloat_Check(op) ((op)->ob_type == &PyFloat_Type)

! extern DL_IMPORT(PyObject *) PyFloat_FromString Py_PROTO((PyObject*, char**));
! extern DL_IMPORT(PyObject *) PyFloat_FromDouble Py_PROTO((double));
! extern DL_IMPORT(double) PyFloat_AsDouble Py_PROTO((PyObject *));

 /* Macro, trading safety for speed */
--- 30,36 ----
 #define PyFloat_Check(op) ((op)->ob_type == &PyFloat_Type)

! extern DL_IMPORT(PyObject *) PyFloat_FromString(PyObject*, char**);
! extern DL_IMPORT(PyObject *) PyFloat_FromDouble(double);
! extern DL_IMPORT(double) PyFloat_AsDouble(PyObject *);

 /* Macro, trading safety for speed */
Index: frameobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/frameobject.h,v
retrieving revision 2.26
retrieving revision 2.27
diff -C2 -r2.26 -r2.27
*** frameobject.h	2000年06月30日 23:58:04	2.26
--- frameobject.h	2000年07月09日 00:20:36	2.27
***************
*** 1,8 ****
- #ifndef Py_FRAMEOBJECT_H
- #define Py_FRAMEOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,46 ****
 /* Frame object interface */

 typedef struct {
! 	int b_type;		/* what kind of block this is */
! 	int b_handler;		/* where to jump to find handler */
! 	int b_level;		/* value stack level to pop to */
 } PyTryBlock;

 typedef struct _frame {
! 	PyObject_HEAD
! 	struct _frame *f_back;	/* previous frame, or NULL */
! 	PyCodeObject *f_code;	/* code segment */
! 	PyObject *f_builtins;	/* builtin symbol table (PyDictObject) */
! 	PyObject *f_globals;	/* global symbol table (PyDictObject) */
! 	PyObject *f_locals;	/* local symbol table (PyDictObject) */
! 	PyObject **f_valuestack; /* points after the last local */
! 	PyObject *f_trace;	/* Trace function */
! 	PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
! 	PyThreadState *f_tstate;
! 	int f_lasti;		/* Last instruction if called */
! 	int f_lineno;		/* Current line number */
! 	int f_restricted;	/* Flag set if restricted operations
 				 in this scope */
! 	int f_iblock;		/* index in f_blockstack */
! 	PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
! 	int f_nlocals;		/* number of locals */
! 	int f_stacksize;	/* size of value stack */
! 	PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */
 } PyFrameObject;

--- 11,46 ----
 /* Frame object interface */

+ #ifndef Py_FRAMEOBJECT_H
+ #define Py_FRAMEOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! int b_type;			/* what kind of block this is */
! int b_handler;		/* where to jump to find handler */
! int b_level;		/* value stack level to pop to */
 } PyTryBlock;

 typedef struct _frame {
! PyObject_HEAD
! struct _frame *f_back;	/* previous frame, or NULL */
! PyCodeObject *f_code;	/* code segment */
! PyObject *f_builtins;	/* builtin symbol table (PyDictObject) */
! PyObject *f_globals;	/* global symbol table (PyDictObject) */
! PyObject *f_locals;		/* local symbol table (PyDictObject) */
! PyObject **f_valuestack;	/* points after the last local */
! PyObject *f_trace;		/* Trace function */
! PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
! PyThreadState *f_tstate;
! int f_lasti;		/* Last instruction if called */
! int f_lineno;		/* Current line number */
! int f_restricted;		/* Flag set if restricted operations
 				 in this scope */
! int f_iblock;		/* index in f_blockstack */
! PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */
! int f_nlocals;		/* number of locals */
! int f_stacksize;		/* size of value stack */
! PyObject *f_localsplus[1];	/* locals+stack, dynamically sized */
 } PyFrameObject;

***************
*** 52,58 ****
 #define PyFrame_Check(op) ((op)->ob_type == &PyFrame_Type)

! DL_IMPORT(PyFrameObject *) PyFrame_New
! 	Py_PROTO((PyThreadState *, PyCodeObject *,
! 		 PyObject *, PyObject *));

--- 52,57 ----
 #define PyFrame_Check(op) ((op)->ob_type == &PyFrame_Type)

! DL_IMPORT(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *,
! PyObject *, PyObject *);

***************
*** 81,95 ****
 /* Block management functions */

! DL_IMPORT(void) PyFrame_BlockSetup Py_PROTO((PyFrameObject *, int, int, int));
! DL_IMPORT(PyTryBlock *) PyFrame_BlockPop Py_PROTO((PyFrameObject *));

 /* Extend the value stack */

! DL_IMPORT(PyObject **) PyFrame_ExtendStack Py_PROTO((PyFrameObject *, int, int));

 /* Conversions between "fast locals" and locals in dictionary */

! DL_IMPORT(void) PyFrame_LocalsToFast Py_PROTO((PyFrameObject *, int));
! DL_IMPORT(void) PyFrame_FastToLocals Py_PROTO((PyFrameObject *));

 #ifdef __cplusplus
--- 80,94 ----
 /* Block management functions */

! DL_IMPORT(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int);
! DL_IMPORT(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *);

 /* Extend the value stack */

! DL_IMPORT(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int);

 /* Conversions between "fast locals" and locals in dictionary */

! DL_IMPORT(void) PyFrame_LocalsToFast(PyFrameObject *, int);
! DL_IMPORT(void) PyFrame_FastToLocals(PyFrameObject *);

 #ifdef __cplusplus
Index: funcobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/funcobject.h,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** funcobject.h	2000年06月30日 23:58:04	2.18
--- funcobject.h	2000年07月09日 00:20:36	2.19
***************
*** 1,8 ****
- #ifndef Py_FUNCOBJECT_H
- #define Py_FUNCOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,27 ****
 /* Function object interface */

 typedef struct {
! 	PyObject_HEAD
! 	PyObject *func_code;
! 	PyObject *func_globals;
! 	PyObject *func_defaults;
! 	PyObject *func_doc;
! 	PyObject *func_name;
 } PyFunctionObject;

--- 11,27 ----
 /* Function object interface */

+ #ifndef Py_FUNCOBJECT_H
+ #define Py_FUNCOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! PyObject_HEAD
! PyObject *func_code;
! PyObject *func_globals;
! PyObject *func_defaults;
! PyObject *func_doc;
! PyObject *func_name;
 } PyFunctionObject;

***************
*** 30,38 ****
 #define PyFunction_Check(op) ((op)->ob_type == &PyFunction_Type)

! extern DL_IMPORT(PyObject *) PyFunction_New Py_PROTO((PyObject *, PyObject *));
! extern DL_IMPORT(PyObject *) PyFunction_GetCode Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyFunction_GetGlobals Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyFunction_GetDefaults Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyFunction_SetDefaults Py_PROTO((PyObject *, PyObject *));

 /* Macros for direct access to these values. Type checks are *not*
--- 30,38 ----
 #define PyFunction_Check(op) ((op)->ob_type == &PyFunction_Type)

! extern DL_IMPORT(PyObject *) PyFunction_New(PyObject *, PyObject *);
! extern DL_IMPORT(PyObject *) PyFunction_GetCode(PyObject *);
! extern DL_IMPORT(PyObject *) PyFunction_GetGlobals(PyObject *);
! extern DL_IMPORT(PyObject *) PyFunction_GetDefaults(PyObject *);
! extern DL_IMPORT(int) PyFunction_SetDefaults(PyObject *, PyObject *);

 /* Macros for direct access to these values. Type checks are *not*
Index: grammar.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/grammar.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** grammar.h	2000年06月30日 23:58:04	2.12
--- grammar.h	2000年07月09日 00:20:36	2.13
***************
*** 1,8 ****
- #ifndef Py_GRAMMAR_H
- #define Py_GRAMMAR_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,20 ****
--- 11,20 ----
 /* Grammar interface */

+ #ifndef Py_GRAMMAR_H
+ #define Py_GRAMMAR_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 #include "bitset.h" /* Sigh... */

***************
*** 22,27 ****

 typedef struct {
! 	int	lb_type;
! 	char	*lb_str;
 } label;

--- 22,27 ----

 typedef struct {
! int		 lb_type;
! char	*lb_str;
 } label;

***************
*** 31,36 ****

 typedef struct {
! 	int	ll_nlabels;
! 	label	*ll_label;
 } labellist;

--- 31,36 ----

 typedef struct {
! int		 ll_nlabels;
! label	*ll_label;
 } labellist;

***************
*** 38,43 ****

 typedef struct {
! 	short		a_lbl;		/* Label of this arc */
! 	short		a_arrow;	/* State where this arc goes to */
 } arc;

--- 38,43 ----

 typedef struct {
! short	a_lbl;		/* Label of this arc */
! short	a_arrow;	/* State where this arc goes to */
 } arc;

***************
*** 45,56 ****

 typedef struct {
! 	int		 s_narcs;
! 	arc		*s_arc;		/* Array of arcs */

! 	/* Optional accelerators */
! 	int		 s_lower;	/* Lowest label index */
! 	int		 s_upper;	/* Highest label index */
! 	int		*s_accel;	/* Accelerator */
! 	int		 s_accept;	/* Nonzero for accepting state */
 } state;

--- 45,56 ----

 typedef struct {
! int		 s_narcs;
! arc		*s_arc;		/* Array of arcs */

! /* Optional accelerators */
! int		 s_lower;	/* Lowest label index */
! int		 s_upper;	/* Highest label index */
! int		*s_accel;	/* Accelerator */
! int		 s_accept;	/* Nonzero for accepting state */
 } state;

***************
*** 58,67 ****

 typedef struct {
! 	int		 d_type;	/* Non-terminal this represents */
! 	char		*d_name;	/* For printing */
! 	int		 d_initial;	/* Initial state */
! 	int		 d_nstates;
! 	state		*d_state;	/* Array of states */
! 	bitset		 d_first;
 } dfa;

--- 58,67 ----

 typedef struct {
! int		 d_type;	/* Non-terminal this represents */
! char	*d_name;	/* For printing */
! int		 d_initial;	/* Initial state */
! int		 d_nstates;
! state	*d_state;	/* Array of states */
! bitset	 d_first;
 } dfa;

***************
*** 69,100 ****

 typedef struct {
! 	int		 g_ndfas;
! 	dfa		*g_dfa;		/* Array of DFAs */
! 	labellist	 g_ll;
! 	int		 g_start;	/* Start symbol of the grammar */
! 	int		 g_accel;	/* Set if accelerators present */
 } grammar;

 /* FUNCTIONS */

! grammar *newgrammar Py_PROTO((int start));
! dfa *adddfa Py_PROTO((grammar *g, int type, char *name));
! int addstate Py_PROTO((dfa *d));
! void addarc Py_PROTO((dfa *d, int from, int to, int lbl));
! dfa *PyGrammar_FindDFA Py_PROTO((grammar *g, int type));
! char *typename Py_PROTO((grammar *g, int lbl));
! 
! int addlabel Py_PROTO((labellist *ll, int type, char *str));
! int findlabel Py_PROTO((labellist *ll, int type, char *str));
! char *PyGrammar_LabelRepr Py_PROTO((label *lb));
! void translatelabels Py_PROTO((grammar *g));

! void addfirstsets Py_PROTO((grammar *g));

! void PyGrammar_AddAccelerators Py_PROTO((grammar *g));
! void PyGrammar_RemoveAccelerators Py_PROTO((grammar *));

! void printgrammar Py_PROTO((grammar *g, FILE *fp));
! void printnonterminals Py_PROTO((grammar *g, FILE *fp));

 #ifdef __cplusplus
--- 69,100 ----

 typedef struct {
! int		 g_ndfas;
! dfa		*g_dfa;		/* Array of DFAs */
! labellist	 g_ll;
! int		 g_start;	/* Start symbol of the grammar */
! int		 g_accel;	/* Set if accelerators present */
 } grammar;

 /* FUNCTIONS */

! grammar *newgrammar(int start);
! dfa *adddfa(grammar *g, int type, char *name);
! int addstate(dfa *d);
! void addarc(dfa *d, int from, int to, int lbl);
! dfa *PyGrammar_FindDFA(grammar *g, int type);
! char *typename(grammar *g, int lbl);
! 
! int addlabel(labellist *ll, int type, char *str);
! int findlabel(labellist *ll, int type, char *str);
! char *PyGrammar_LabelRepr(label *lb);
! void translatelabels(grammar *g);

! void addfirstsets(grammar *g);

! void PyGrammar_AddAccelerators(grammar *g);
! void PyGrammar_RemoveAccelerators(grammar *);

! void printgrammar(grammar *g, FILE *fp);
! void printnonterminals(grammar *g, FILE *fp);

 #ifdef __cplusplus
Index: intobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/intobject.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** intobject.h	2000年06月30日 23:58:04	2.19
--- intobject.h	2000年07月09日 00:20:36	2.20
***************
*** 1,8 ****
- #ifndef Py_INTOBJECT_H
- #define Py_INTOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 30,36 ****
 */

 typedef struct {
! 	PyObject_HEAD
! 	long ob_ival;
 } PyIntObject;

--- 24,36 ----
 */

+ #ifndef Py_INTOBJECT_H
+ #define Py_INTOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! PyObject_HEAD
! long ob_ival;
 } PyIntObject;

***************
*** 39,47 ****
 #define PyInt_Check(op) ((op)->ob_type == &PyInt_Type)

! extern DL_IMPORT(PyObject *) PyInt_FromString Py_PROTO((char*, char**, int));
! extern DL_IMPORT(PyObject *) PyInt_FromUnicode Py_PROTO((Py_UNICODE*, int, int));
! extern DL_IMPORT(PyObject *) PyInt_FromLong Py_PROTO((long));
! extern DL_IMPORT(long) PyInt_AsLong Py_PROTO((PyObject *));
! extern DL_IMPORT(long) PyInt_GetMax Py_PROTO((void));

--- 39,47 ----
 #define PyInt_Check(op) ((op)->ob_type == &PyInt_Type)

! extern DL_IMPORT(PyObject *) PyInt_FromString(char*, char**, int);
! extern DL_IMPORT(PyObject *) PyInt_FromUnicode(Py_UNICODE*, int, int);
! extern DL_IMPORT(PyObject *) PyInt_FromLong(long);
! extern DL_IMPORT(long) PyInt_AsLong(PyObject *);
! extern DL_IMPORT(long) PyInt_GetMax(void);

***************
*** 69,74 ****
 * building it this way. :-) [cjh]
 */
! extern DL_IMPORT(unsigned long) PyOS_strtoul Py_PROTO((char *, char **, int));
! extern DL_IMPORT(long) PyOS_strtol Py_PROTO((char *, char **, int));

 #ifdef __cplusplus
--- 69,74 ----
 * building it this way. :-) [cjh]
 */
! extern DL_IMPORT(unsigned long) PyOS_strtoul(char *, char **, int);
! extern DL_IMPORT(long) PyOS_strtol(char *, char **, int);

 #ifdef __cplusplus
Index: listobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/listobject.h,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** listobject.h	2000年06月30日 23:58:04	2.19
--- listobject.h	2000年07月09日 00:20:36	2.20
***************
*** 1,8 ****
- #ifndef Py_LISTOBJECT_H
- #define Py_LISTOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 29,35 ****
 */

 typedef struct {
! 	PyObject_VAR_HEAD
! 	PyObject **ob_item;
 } PyListObject;

--- 23,35 ----
 */

+ #ifndef Py_LISTOBJECT_H
+ #define Py_LISTOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 typedef struct {
! PyObject_VAR_HEAD
! PyObject **ob_item;
 } PyListObject;

***************
*** 38,52 ****
 #define PyList_Check(op) ((op)->ob_type == &PyList_Type)

! extern DL_IMPORT(PyObject *) PyList_New Py_PROTO((int size));
! extern DL_IMPORT(int) PyList_Size Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyList_GetItem Py_PROTO((PyObject *, int));
! extern DL_IMPORT(int) PyList_SetItem Py_PROTO((PyObject *, int, PyObject *));
! extern DL_IMPORT(int) PyList_Insert Py_PROTO((PyObject *, int, PyObject *));
! extern DL_IMPORT(int) PyList_Append Py_PROTO((PyObject *, PyObject *));
! extern DL_IMPORT(PyObject *) PyList_GetSlice Py_PROTO((PyObject *, int, int));
! extern DL_IMPORT(int) PyList_SetSlice Py_PROTO((PyObject *, int, int, PyObject *));
! extern DL_IMPORT(int) PyList_Sort Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyList_Reverse Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyList_AsTuple Py_PROTO((PyObject *));

 /* Macro, trading safety for speed */
--- 38,52 ----
 #define PyList_Check(op) ((op)->ob_type == &PyList_Type)

! extern DL_IMPORT(PyObject *) PyList_New(int size);
! extern DL_IMPORT(int) PyList_Size(PyObject *);
! extern DL_IMPORT(PyObject *) PyList_GetItem(PyObject *, int);
! extern DL_IMPORT(int) PyList_SetItem(PyObject *, int, PyObject *);
! extern DL_IMPORT(int) PyList_Insert(PyObject *, int, PyObject *);
! extern DL_IMPORT(int) PyList_Append(PyObject *, PyObject *);
! extern DL_IMPORT(PyObject *) PyList_GetSlice(PyObject *, int, int);
! extern DL_IMPORT(int) PyList_SetSlice(PyObject *, int, int, PyObject *);
! extern DL_IMPORT(int) PyList_Sort(PyObject *);
! extern DL_IMPORT(int) PyList_Reverse(PyObject *);
! extern DL_IMPORT(PyObject *) PyList_AsTuple(PyObject *);

 /* Macro, trading safety for speed */
Index: methodobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/methodobject.h,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** methodobject.h	2000年06月30日 23:58:04	2.18
--- methodobject.h	2000年07月09日 00:20:36	2.19
***************
*** 1,8 ****
- #ifndef Py_METHODOBJECT_H
- #define Py_METHODOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,20 ****
--- 11,20 ----
 /* Method object interface */

+ #ifndef Py_METHODOBJECT_H
+ #define Py_METHODOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
 extern DL_IMPORT(PyTypeObject) PyCFunction_Type;

***************
*** 25,31 ****
 	Py_FPROTO((PyObject *, PyObject *, PyObject *));

! extern DL_IMPORT(PyCFunction) PyCFunction_GetFunction Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyCFunction_GetSelf Py_PROTO((PyObject *));
! extern DL_IMPORT(int) PyCFunction_GetFlags Py_PROTO((PyObject *));

 /* Macros for direct access to these values. Type checks are *not*
--- 25,31 ----
 	Py_FPROTO((PyObject *, PyObject *, PyObject *));

! extern DL_IMPORT(PyCFunction) PyCFunction_GetFunction(PyObject *);
! extern DL_IMPORT(PyObject *) PyCFunction_GetSelf(PyObject *);
! extern DL_IMPORT(int) PyCFunction_GetFlags(PyObject *);

 /* Macros for direct access to these values. Type checks are *not*
***************
*** 39,54 ****

 struct PyMethodDef {
! 	char		*ml_name;
! 	PyCFunction	ml_meth;
! 	int		ml_flags;
! 	char		*ml_doc;
 };
 typedef struct PyMethodDef PyMethodDef;

! extern DL_IMPORT(PyObject *) Py_FindMethod
! 	Py_PROTO((PyMethodDef[], PyObject *, char *));

! extern DL_IMPORT(PyObject *) PyCFunction_New
! 	Py_PROTO((PyMethodDef *, PyObject *));

 /* Flag passed to newmethodobject */
--- 39,52 ----

 struct PyMethodDef {
! char	*ml_name;
! PyCFunction ml_meth;
! int		 ml_flags;
! char	*ml_doc;
 };
 typedef struct PyMethodDef PyMethodDef;

! extern DL_IMPORT(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, char *);

! extern DL_IMPORT(PyObject *) PyCFunction_New(PyMethodDef *, PyObject *);

 /* Flag passed to newmethodobject */
***************
*** 57,71 ****

 typedef struct PyMethodChain {
! 	PyMethodDef *methods;		/* Methods of this type */
! 	struct PyMethodChain *link;	/* NULL or base type */
 } PyMethodChain;

! extern DL_IMPORT(PyObject *) Py_FindMethodInChain
! 	Py_PROTO((PyMethodChain *, PyObject *, char *));

 typedef struct {
! 	PyObject_HEAD
! 	PyMethodDef *m_ml;
! 	PyObject *m_self;
 } PyCFunctionObject;

--- 55,69 ----

 typedef struct PyMethodChain {
! PyMethodDef *methods;		/* Methods of this type */
! struct PyMethodChain *link;	/* NULL or base type */
 } PyMethodChain;

! extern DL_IMPORT(PyObject *) Py_FindMethodInChain(PyMethodChain *, PyObject *,
! char *);

 typedef struct {
! PyObject_HEAD
! PyMethodDef *m_ml;
! PyObject *m_self;
 } PyCFunctionObject;