[Python-checkins] CVS: python/dist/src/Include moduleobject.h,2.15,2.16 objimpl.h,2.20,2.21 pythonrun.h,2.30,2.31 pythread.h,2.15,2.16 rangeobject.h,2.13,2.14 sliceobject.h,2.4,2.5 stringobject.h,2.20,2.21 sysmodule.h,2.19,2.20 token.h,2.14,2.15 tupleobject.h,2.22,2.23

Sat, 8 Jul 2000 17:55:09 -0700

Update of /cvsroot/python/python/dist/src/Include
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17017

Modified Files:
	moduleobject.h objimpl.h pythonrun.h pythread.h rangeobject.h 
	sliceobject.h stringobject.h sysmodule.h token.h tupleobject.h 
Log Message:

ANSI-fication and Py_PROTO extermination.

Index: moduleobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/moduleobject.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** moduleobject.h	2000/06/30 23:58:04	2.15
--- moduleobject.h	2000/07/09 00:55:06	2.16
***************
*** 1,8 ****
- #ifndef Py_MODULEOBJECT_H
- #define Py_MODULEOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,29 ****
  /* Module object interface */

  extern DL_IMPORT(PyTypeObject) PyModule_Type;

  #define PyModule_Check(op) ((op)->ob_type == &PyModule_Type)

! extern DL_IMPORT(PyObject *) PyModule_New Py_PROTO((char *));
! extern DL_IMPORT(PyObject *) PyModule_GetDict Py_PROTO((PyObject *));
! extern DL_IMPORT(char *) PyModule_GetName Py_PROTO((PyObject *));
! extern DL_IMPORT(char *) PyModule_GetFilename Py_PROTO((PyObject *));
! extern DL_IMPORT(void) _PyModule_Clear Py_PROTO((PyObject *));

  #ifdef __cplusplus
--- 11,29 ----
  /* Module object interface */

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

  #define PyModule_Check(op) ((op)->ob_type == &PyModule_Type)

! extern DL_IMPORT(PyObject *) PyModule_New(char *);
! extern DL_IMPORT(PyObject *) PyModule_GetDict(PyObject *);
! extern DL_IMPORT(char *) PyModule_GetName(PyObject *);
! extern DL_IMPORT(char *) PyModule_GetFilename(PyObject *);
! extern DL_IMPORT(void) _PyModule_Clear(PyObject *);

  #ifdef __cplusplus

Index: objimpl.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/objimpl.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** objimpl.h	2000/07/01 01:00:35	2.20
--- objimpl.h	2000/07/09 00:55:06	2.21
***************
*** 1,8 ****
- #ifndef Py_OBJIMPL_H
- #define Py_OBJIMPL_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 15,18 ****
--- 9,18 ----
  ******************************************************************/

+ #ifndef Py_OBJIMPL_H
+ #define Py_OBJIMPL_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  #include "mymalloc.h"

***************
*** 138,144 ****
     bytes returns a non-NULL pointer. Returned pointers must be checked
     for NULL explicitly; no action is performed on failure. */
! extern DL_IMPORT(ANY *) PyObject_Malloc Py_PROTO((size_t));
! extern DL_IMPORT(ANY *) PyObject_Realloc Py_PROTO((ANY *, size_t));
! extern DL_IMPORT(void) PyObject_Free Py_PROTO((ANY *));

  /* Macros */
--- 138,144 ----
     bytes returns a non-NULL pointer. Returned pointers must be checked
     for NULL explicitly; no action is performed on failure. */
! extern DL_IMPORT(ANY *) PyObject_Malloc(size_t);
! extern DL_IMPORT(ANY *) PyObject_Realloc(ANY *, size_t);
! extern DL_IMPORT(void) PyObject_Free(ANY *);

  /* Macros */
***************
*** 153,161 ****

  /* Functions */
! extern DL_IMPORT(PyObject *) PyObject_Init Py_PROTO((PyObject *, PyTypeObject *));
! extern DL_IMPORT(PyVarObject *) PyObject_InitVar Py_PROTO((PyVarObject *, PyTypeObject *, int));
! extern DL_IMPORT(PyObject *) _PyObject_New Py_PROTO((PyTypeObject *));
! extern DL_IMPORT(PyVarObject *) _PyObject_NewVar Py_PROTO((PyTypeObject *, int));
! extern DL_IMPORT(void) _PyObject_Del Py_PROTO((PyObject *));

  #define PyObject_New(type, typeobj) \
--- 153,162 ----

  /* Functions */
! extern DL_IMPORT(PyObject *) PyObject_Init(PyObject *, PyTypeObject *);
! extern DL_IMPORT(PyVarObject *) PyObject_InitVar(PyVarObject *,
!                                                  PyTypeObject *, int);
! extern DL_IMPORT(PyObject *) _PyObject_New(PyTypeObject *);
! extern DL_IMPORT(PyVarObject *) _PyObject_NewVar(PyTypeObject *, int);
! extern DL_IMPORT(void) _PyObject_Del(PyObject *);

  #define PyObject_New(type, typeobj) \
***************
*** 241,248 ****

  /* Add the object into the container set */
! extern DL_IMPORT(void) _PyGC_Insert Py_PROTO((PyObject *));

  /* Remove the object from the container set */
! extern DL_IMPORT(void) _PyGC_Remove Py_PROTO((PyObject *));

  #define PyObject_GC_Init(op) _PyGC_Insert((PyObject *)op)
--- 242,249 ----

  /* Add the object into the container set */
! extern DL_IMPORT(void) _PyGC_Insert(PyObject *);

  /* Remove the object from the container set */
! extern DL_IMPORT(void) _PyGC_Remove(PyObject *);

  #define PyObject_GC_Init(op) _PyGC_Insert((PyObject *)op)

Index: pythonrun.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pythonrun.h,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** pythonrun.h	2000/06/30 23:58:04	2.30
--- pythonrun.h	2000/07/09 00:55:06	2.31
***************
*** 1,8 ****
- #ifndef Py_PYTHONRUN_H
- #define Py_PYTHONRUN_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 16,91 ****

  /* Interfaces to parse and execute pieces of python code */

! DL_IMPORT(void) Py_SetProgramName Py_PROTO((char *));
! DL_IMPORT(char *) Py_GetProgramName Py_PROTO((void));

! DL_IMPORT(void) Py_SetPythonHome Py_PROTO((char *));
! DL_IMPORT(char *) Py_GetPythonHome Py_PROTO((void));

! DL_IMPORT(void) Py_Initialize Py_PROTO((void));
! DL_IMPORT(void) Py_Finalize Py_PROTO((void));
! DL_IMPORT(int) Py_IsInitialized Py_PROTO((void));
! DL_IMPORT(PyThreadState *) Py_NewInterpreter Py_PROTO((void));
! DL_IMPORT(void) Py_EndInterpreter Py_PROTO((PyThreadState *));

! DL_IMPORT(int) PyRun_AnyFile Py_PROTO((FILE *, char *));

! DL_IMPORT(int) PyRun_SimpleString Py_PROTO((char *));
! DL_IMPORT(int) PyRun_SimpleFile Py_PROTO((FILE *, char *));
! DL_IMPORT(int) PyRun_InteractiveOne Py_PROTO((FILE *, char *));
! DL_IMPORT(int) PyRun_InteractiveLoop Py_PROTO((FILE *, char *));

! DL_IMPORT(struct _node *) PyParser_SimpleParseString Py_PROTO((char *, int));
! DL_IMPORT(struct _node *) PyParser_SimpleParseFile Py_PROTO((FILE *, char *, int));

! DL_IMPORT(PyObject *) PyRun_String Py_PROTO((char *, int, PyObject *, PyObject *));
! DL_IMPORT(PyObject *) PyRun_File Py_PROTO((FILE *, char *, int, PyObject *, PyObject *));

! DL_IMPORT(PyObject *) Py_CompileString Py_PROTO((char *, char *, int));

! DL_IMPORT(void) PyErr_Print Py_PROTO((void));
! DL_IMPORT(void) PyErr_PrintEx Py_PROTO((int));

! DL_IMPORT(int) Py_AtExit Py_PROTO((void (*func) Py_PROTO((void))));

! DL_IMPORT(void) Py_Exit Py_PROTO((int));

! DL_IMPORT(int) Py_FdIsInteractive Py_PROTO((FILE *, char *));

  /* In getpath.c */
! DL_IMPORT(char *) Py_GetProgramFullPath Py_PROTO((void));
! DL_IMPORT(char *) Py_GetPrefix Py_PROTO((void));
! DL_IMPORT(char *) Py_GetExecPrefix Py_PROTO((void));
! DL_IMPORT(char *) Py_GetPath Py_PROTO((void));

  /* In their own files */
! DL_IMPORT(const char *) Py_GetVersion Py_PROTO((void));
! DL_IMPORT(const char *) Py_GetPlatform Py_PROTO((void));
! DL_IMPORT(const char *) Py_GetCopyright Py_PROTO((void));
! DL_IMPORT(const char *) Py_GetCompiler Py_PROTO((void));
! DL_IMPORT(const char *) Py_GetBuildInfo Py_PROTO((void));

  /* Internal -- various one-time initializations */
! DL_IMPORT(PyObject *) _PyBuiltin_Init Py_PROTO((void));
! DL_IMPORT(PyObject *) _PySys_Init Py_PROTO((void));
! DL_IMPORT(void) _PyImport_Init Py_PROTO((void));
! DL_IMPORT(void) init_exceptions Py_PROTO((void));

  /* Various internal finalizers */
! DL_IMPORT(void) fini_exceptions Py_PROTO((void));
! DL_IMPORT(void) _PyImport_Fini Py_PROTO((void));
! DL_IMPORT(void) PyMethod_Fini Py_PROTO((void));
! DL_IMPORT(void) PyFrame_Fini Py_PROTO((void));
! DL_IMPORT(void) PyCFunction_Fini Py_PROTO((void));
! DL_IMPORT(void) PyTuple_Fini Py_PROTO((void));
! DL_IMPORT(void) PyString_Fini Py_PROTO((void));
! DL_IMPORT(void) PyInt_Fini Py_PROTO((void));
! DL_IMPORT(void) PyFloat_Fini Py_PROTO((void));
! DL_IMPORT(void) PyOS_FiniInterrupts Py_PROTO((void));

  /* Stuff with no proper home (yet) */
! DL_IMPORT(char *) PyOS_Readline Py_PROTO((char *));
! extern DL_IMPORT(int) (*PyOS_InputHook) Py_PROTO((void));
! extern DL_IMPORT(char) *(*PyOS_ReadlineFunctionPointer) Py_PROTO((char *));

  #ifdef __cplusplus
--- 10,91 ----

  /* Interfaces to parse and execute pieces of python code */
+ 
+ #ifndef Py_PYTHONRUN_H
+ #define Py_PYTHONRUN_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

! DL_IMPORT(void) Py_SetProgramName(char *);
! DL_IMPORT(char *) Py_GetProgramName(void);

! DL_IMPORT(void) Py_SetPythonHome(char *);
! DL_IMPORT(char *) Py_GetPythonHome(void);

! DL_IMPORT(void) Py_Initialize(void);
! DL_IMPORT(void) Py_Finalize(void);
! DL_IMPORT(int) Py_IsInitialized(void);
! DL_IMPORT(PyThreadState *) Py_NewInterpreter(void);
! DL_IMPORT(void) Py_EndInterpreter(PyThreadState *);

! DL_IMPORT(int) PyRun_AnyFile(FILE *, char *);

! DL_IMPORT(int) PyRun_SimpleString(char *);
! DL_IMPORT(int) PyRun_SimpleFile(FILE *, char *);
! DL_IMPORT(int) PyRun_InteractiveOne(FILE *, char *);
! DL_IMPORT(int) PyRun_InteractiveLoop(FILE *, char *);

! DL_IMPORT(struct _node *) PyParser_SimpleParseString(char *, int);
! DL_IMPORT(struct _node *) PyParser_SimpleParseFile(FILE *, char *, int);

! DL_IMPORT(PyObject *) PyRun_String(char *, int, PyObject *, PyObject *);
! DL_IMPORT(PyObject *) PyRun_File(FILE *, char *, int, PyObject *, PyObject *);

! DL_IMPORT(PyObject *) Py_CompileString(char *, char *, int);

! DL_IMPORT(void) PyErr_Print(void);
! DL_IMPORT(void) PyErr_PrintEx(int);

! DL_IMPORT(int) Py_AtExit(void (*func)(void));

! DL_IMPORT(void) Py_Exit(int);

! DL_IMPORT(int) Py_FdIsInteractive(FILE *, char *);

  /* In getpath.c */
! DL_IMPORT(char *) Py_GetProgramFullPath(void);
! DL_IMPORT(char *) Py_GetPrefix(void);
! DL_IMPORT(char *) Py_GetExecPrefix(void);
! DL_IMPORT(char *) Py_GetPath(void);

  /* In their own files */
! DL_IMPORT(const char *) Py_GetVersion(void);
! DL_IMPORT(const char *) Py_GetPlatform(void);
! DL_IMPORT(const char *) Py_GetCopyright(void);
! DL_IMPORT(const char *) Py_GetCompiler(void);
! DL_IMPORT(const char *) Py_GetBuildInfo(void);

  /* Internal -- various one-time initializations */
! DL_IMPORT(PyObject *) _PyBuiltin_Init(void);
! DL_IMPORT(PyObject *) _PySys_Init(void);
! DL_IMPORT(void) _PyImport_Init(void);
! DL_IMPORT(void) init_exceptions(void);

  /* Various internal finalizers */
! DL_IMPORT(void) fini_exceptions(void);
! DL_IMPORT(void) _PyImport_Fini(void);
! DL_IMPORT(void) PyMethod_Fini(void);
! DL_IMPORT(void) PyFrame_Fini(void);
! DL_IMPORT(void) PyCFunction_Fini(void);
! DL_IMPORT(void) PyTuple_Fini(void);
! DL_IMPORT(void) PyString_Fini(void);
! DL_IMPORT(void) PyInt_Fini(void);
! DL_IMPORT(void) PyFloat_Fini(void);
! DL_IMPORT(void) PyOS_FiniInterrupts(void);

  /* Stuff with no proper home (yet) */
! DL_IMPORT(char *) PyOS_Readline(char *);
! extern DL_IMPORT(int) (*PyOS_InputHook)(void);
! extern DL_IMPORT(char) *(*PyOS_ReadlineFunctionPointer)(char *);

  #ifdef __cplusplus

Index: pythread.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pythread.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** pythread.h	2000/06/30 23:58:04	2.15
--- pythread.h	2000/07/09 00:55:06	2.16
***************
*** 1,5 ****
- #ifndef Py_PYTHREAD_H
- #define Py_PYTHREAD_H
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 12,26 ****
  ******************************************************************/

  #define NO_EXIT_PROG		/* don't define PyThread_exit_prog() */
  				/* (the result is no use of signals on SGI) */

- #ifndef Py_PROTO
- #if defined(__STDC__) || defined(__cplusplus)
- #define Py_PROTO(args)	args
- #else
- #define Py_PROTO(args)	()
- #endif
- #endif
- 
  typedef void *PyThread_type_lock;
  typedef void *PyThread_type_sema;
--- 9,18 ----
  ******************************************************************/

+ #ifndef Py_PYTHREAD_H
+ #define Py_PYTHREAD_H
+ 
  #define NO_EXIT_PROG		/* don't define PyThread_exit_prog() */
  				/* (the result is no use of signals on SGI) */

  typedef void *PyThread_type_lock;
  typedef void *PyThread_type_sema;
***************
*** 30,62 ****
  #endif

! DL_IMPORT(void) PyThread_init_thread Py_PROTO((void));
! DL_IMPORT(int) PyThread_start_new_thread Py_PROTO((void (*)(void *), void *));
! DL_IMPORT(void) PyThread_exit_thread Py_PROTO((void));
! DL_IMPORT(void) PyThread__PyThread_exit_thread Py_PROTO((void));
! DL_IMPORT(long) PyThread_get_thread_ident Py_PROTO((void));
! 
! DL_IMPORT(PyThread_type_lock) PyThread_allocate_lock Py_PROTO((void));
! DL_IMPORT(void) PyThread_free_lock Py_PROTO((PyThread_type_lock));
! DL_IMPORT(int) PyThread_acquire_lock Py_PROTO((PyThread_type_lock, int));
  #define WAIT_LOCK	1
  #define NOWAIT_LOCK	0
! DL_IMPORT(void) PyThread_release_lock Py_PROTO((PyThread_type_lock));

! DL_IMPORT(PyThread_type_sema) PyThread_allocate_sema Py_PROTO((int));
! DL_IMPORT(void) PyThread_free_sema Py_PROTO((PyThread_type_sema));
! DL_IMPORT(int) PyThread_down_sema Py_PROTO((PyThread_type_sema, int));
  #define WAIT_SEMA	1
  #define NOWAIT_SEMA	0
! DL_IMPORT(void) PyThread_up_sema Py_PROTO((PyThread_type_sema));

  #ifndef NO_EXIT_PROG
! DL_IMPORT(void) PyThread_exit_prog Py_PROTO((int));
! DL_IMPORT(void) PyThread__PyThread_exit_prog Py_PROTO((int));
  #endif

! DL_IMPORT(int) PyThread_create_key Py_PROTO((void));
! DL_IMPORT(void) PyThread_delete_key Py_PROTO((int));
! DL_IMPORT(int) PyThread_set_key_value Py_PROTO((int, void *));
! DL_IMPORT(void *) PyThread_get_key_value Py_PROTO((int));

  #ifdef __cplusplus
--- 22,54 ----
  #endif

! DL_IMPORT(void) PyThread_init_thread(void);
! DL_IMPORT(int) PyThread_start_new_thread(void (*)(void *), void *);
! DL_IMPORT(void) PyThread_exit_thread(void);
! DL_IMPORT(void) PyThread__PyThread_exit_thread(void);
! DL_IMPORT(long) PyThread_get_thread_ident(void);
! 
! DL_IMPORT(PyThread_type_lock) PyThread_allocate_lock(void);
! DL_IMPORT(void) PyThread_free_lock(PyThread_type_lock);
! DL_IMPORT(int) PyThread_acquire_lock(PyThread_type_lock, int);
  #define WAIT_LOCK	1
  #define NOWAIT_LOCK	0
! DL_IMPORT(void) PyThread_release_lock(PyThread_type_lock);

! DL_IMPORT(PyThread_type_sema) PyThread_allocate_sema(int);
! DL_IMPORT(void) PyThread_free_sema(PyThread_type_sema);
! DL_IMPORT(int) PyThread_down_sema(PyThread_type_sema, int);
  #define WAIT_SEMA	1
  #define NOWAIT_SEMA	0
! DL_IMPORT(void) PyThread_up_sema(PyThread_type_sema);

  #ifndef NO_EXIT_PROG
! DL_IMPORT(void) PyThread_exit_prog(int);
! DL_IMPORT(void) PyThread__PyThread_exit_prog(int);
  #endif

! DL_IMPORT(int) PyThread_create_key(void);
! DL_IMPORT(void) PyThread_delete_key(int);
! DL_IMPORT(int) PyThread_set_key_value(int, void *);
! DL_IMPORT(void *) PyThread_get_key_value(int);

  #ifdef __cplusplus

Index: rangeobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/rangeobject.h,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** rangeobject.h	2000/06/30 23:58:04	2.13
--- rangeobject.h	2000/07/09 00:55:06	2.14
***************
*** 23,25 ****
  #define PyRange_Check(op) ((op)->ob_type == &PyRange_Type)

! extern DL_IMPORT(PyObject *) PyRange_New Py_PROTO((long, long, long, int));
--- 23,25 ----
  #define PyRange_Check(op) ((op)->ob_type == &PyRange_Type)

! extern DL_IMPORT(PyObject *) PyRange_New(long, long, long, int);

Index: sliceobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/sliceobject.h,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -r2.4 -r2.5
*** sliceobject.h	1998/12/04 18:48:20	2.4
--- sliceobject.h	2000/07/09 00:55:06	2.5
***************
*** 21,26 ****

  typedef struct {
! 	PyObject_HEAD
! 	PyObject *start, *stop, *step;
  } PySliceObject;

--- 21,26 ----

  typedef struct {
!     PyObject_HEAD
!     PyObject *start, *stop, *step;
  } PySliceObject;

***************
*** 29,36 ****
  #define PySlice_Check(op) ((op)->ob_type == &PySlice_Type)

! DL_IMPORT(PyObject *) PySlice_New Py_PROTO((
! 	PyObject* start, PyObject* stop, PyObject* step));
! DL_IMPORT(int) PySlice_GetIndices Py_PROTO((
! 	PySliceObject *r, int length, int *start, int *stop, int *step));

  #ifdef __cplusplus
--- 29,36 ----
  #define PySlice_Check(op) ((op)->ob_type == &PySlice_Type)

! DL_IMPORT(PyObject *) PySlice_New(PyObject* start, PyObject* stop,
!                                   PyObject* step);
! DL_IMPORT(int) PySlice_GetIndices(PySliceObject *r, int length,
!                                   int *start, int *stop, int *step);

  #ifdef __cplusplus

Index: stringobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/stringobject.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** stringobject.h	2000/07/06 11:25:40	2.20
--- stringobject.h	2000/07/09 00:55:06	2.21
***************
*** 1,8 ****
- #ifndef Py_STRINGOBJECT_H
- #define Py_STRINGOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,20 ****
--- 11,20 ----
  /* String object interface */

+ #ifndef Py_STRINGOBJECT_H
+ #define Py_STRINGOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /*
  Type PyStringObject represents a character string.  An extra zero byte is
***************
*** 47,58 ****

  typedef struct {
! 	PyObject_VAR_HEAD
  #ifdef CACHE_HASH
! 	long ob_shash;
  #endif
  #ifdef INTERN_STRINGS
! 	PyObject *ob_sinterned;
  #endif
! 	char ob_sval[1];
  } PyStringObject;

--- 47,58 ----

  typedef struct {
!     PyObject_VAR_HEAD
  #ifdef CACHE_HASH
!     long ob_shash;
  #endif
  #ifdef INTERN_STRINGS
!     PyObject *ob_sinterned;
  #endif
!     char ob_sval[1];
  } PyStringObject;

***************
*** 61,76 ****
  #define PyString_Check(op) ((op)->ob_type == &PyString_Type)

! extern DL_IMPORT(PyObject *) PyString_FromStringAndSize Py_PROTO((const char *, int));
! extern DL_IMPORT(PyObject *) PyString_FromString Py_PROTO((const char *));
! extern DL_IMPORT(int) PyString_Size Py_PROTO((PyObject *));
! extern DL_IMPORT(char *) PyString_AsString Py_PROTO((PyObject *));
! extern DL_IMPORT(void) PyString_Concat Py_PROTO((PyObject **, PyObject *));
! extern DL_IMPORT(void) PyString_ConcatAndDel Py_PROTO((PyObject **, PyObject *));
! extern DL_IMPORT(int) _PyString_Resize Py_PROTO((PyObject **, int));
! extern DL_IMPORT(PyObject *) PyString_Format Py_PROTO((PyObject *, PyObject *));

  #ifdef INTERN_STRINGS
! extern DL_IMPORT(void) PyString_InternInPlace Py_PROTO((PyObject **));
! extern DL_IMPORT(PyObject *) PyString_InternFromString Py_PROTO((const char *));
  #else
  #define PyString_InternInPlace(p)
--- 61,76 ----
  #define PyString_Check(op) ((op)->ob_type == &PyString_Type)

! extern DL_IMPORT(PyObject *) PyString_FromStringAndSize(const char *, int);
! extern DL_IMPORT(PyObject *) PyString_FromString(const char *);
! extern DL_IMPORT(int) PyString_Size(PyObject *);
! extern DL_IMPORT(char *) PyString_AsString(PyObject *);
! extern DL_IMPORT(void) PyString_Concat(PyObject **, PyObject *);
! extern DL_IMPORT(void) PyString_ConcatAndDel(PyObject **, PyObject *);
! extern DL_IMPORT(int) _PyString_Resize(PyObject **, int);
! extern DL_IMPORT(PyObject *) PyString_Format(PyObject *, PyObject *);

  #ifdef INTERN_STRINGS
! extern DL_IMPORT(void) PyString_InternInPlace(PyObject **);
! extern DL_IMPORT(PyObject *) PyString_InternFromString(const char *);
  #else
  #define PyString_InternInPlace(p)

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

  /* System module interface */

! DL_IMPORT(PyObject *) PySys_GetObject Py_PROTO((char *));
! DL_IMPORT(int) PySys_SetObject Py_PROTO((char *, PyObject *));
! DL_IMPORT(FILE *) PySys_GetFile Py_PROTO((char *, FILE *));
! DL_IMPORT(void) PySys_SetArgv Py_PROTO((int, char **));
! DL_IMPORT(void) PySys_SetPath Py_PROTO((char *));

  #ifdef HAVE_STDARG_PROTOTYPES
--- 10,25 ----

  /* System module interface */
+ 
+ #ifndef Py_SYSMODULE_H
+ #define Py_SYSMODULE_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

! DL_IMPORT(PyObject *) PySys_GetObject(char *);
! DL_IMPORT(int) PySys_SetObject(char *, PyObject *);
! DL_IMPORT(FILE *) PySys_GetFile(char *, FILE *);
! DL_IMPORT(void) PySys_SetArgv(int, char **);
! DL_IMPORT(void) PySys_SetPath(char *);

  #ifdef HAVE_STDARG_PROTOTYPES

Index: token.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/token.h,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** token.h	2000/06/30 23:58:04	2.14
--- token.h	2000/07/09 00:55:06	2.15
***************
*** 1,8 ****
- #ifndef Py_TOKEN_H
- #define Py_TOKEN_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,20 ****
--- 11,20 ----
  /* Token types */

+ #ifndef Py_TOKEN_H
+ #define Py_TOKEN_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  #define ENDMARKER	0
  #define NAME		1
***************
*** 69,74 ****

  extern DL_IMPORT(char *) _PyParser_TokenNames[]; /* Token names */
! extern DL_IMPORT(int) PyToken_OneChar Py_PROTO((int));
! extern DL_IMPORT(int) PyToken_TwoChars Py_PROTO((int, int));

  #ifdef __cplusplus
--- 69,74 ----

  extern DL_IMPORT(char *) _PyParser_TokenNames[]; /* Token names */
! extern DL_IMPORT(int) PyToken_OneChar(int);
! extern DL_IMPORT(int) PyToken_TwoChars(int, int);

  #ifdef __cplusplus

Index: tupleobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/tupleobject.h,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** tupleobject.h	2000/06/30 23:58:04	2.22
--- tupleobject.h	2000/07/09 00:55:06	2.23
***************
*** 1,8 ****
- #ifndef Py_TUPLEOBJECT_H
- #define Py_TUPLEOBJECT_H
- #ifdef __cplusplus
- extern "C" {
- #endif
- 
  /***********************************************************
  Copyright (c) 2000, BeOpen.com.
--- 1,2 ----
***************
*** 17,20 ****
--- 11,20 ----
  /* Tuple object interface */

+ #ifndef Py_TUPLEOBJECT_H
+ #define Py_TUPLEOBJECT_H
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
  /*
  Another generally useful object type is an tuple of object pointers.
***************
*** 30,35 ****

  typedef struct {
! 	PyObject_VAR_HEAD
! 	PyObject *ob_item[1];
  } PyTupleObject;

--- 30,35 ----

  typedef struct {
!     PyObject_VAR_HEAD
!     PyObject *ob_item[1];
  } PyTupleObject;

***************
*** 38,47 ****
  #define PyTuple_Check(op) ((op)->ob_type == &PyTuple_Type)

! extern DL_IMPORT(PyObject *) PyTuple_New Py_PROTO((int size));
! extern DL_IMPORT(int) PyTuple_Size Py_PROTO((PyObject *));
! extern DL_IMPORT(PyObject *) PyTuple_GetItem Py_PROTO((PyObject *, int));
! extern DL_IMPORT(int) PyTuple_SetItem Py_PROTO((PyObject *, int, PyObject *));
! extern DL_IMPORT(PyObject *) PyTuple_GetSlice Py_PROTO((PyObject *, int, int));
! extern DL_IMPORT(int) _PyTuple_Resize Py_PROTO((PyObject **, int, int));

  /* Macro, trading safety for speed */
--- 38,47 ----
  #define PyTuple_Check(op) ((op)->ob_type == &PyTuple_Type)

! extern DL_IMPORT(PyObject *) PyTuple_New(int size);
! extern DL_IMPORT(int) PyTuple_Size(PyObject *);
! extern DL_IMPORT(PyObject *) PyTuple_GetItem(PyObject *, int);
! extern DL_IMPORT(int) PyTuple_SetItem(PyObject *, int, PyObject *);
! extern DL_IMPORT(PyObject *) PyTuple_GetSlice(PyObject *, int, int);
! extern DL_IMPORT(int) _PyTuple_Resize(PyObject **, int, int);

  /* Macro, trading safety for speed */