[Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.168,2.169 ceval.c,2.182,2.183 compile.c,2.113,2.114 errors.c,2.47,2.48 getargs.c,2.38,2.39 import.c,2.139,2.140 importdl.h,2.14,2.15 marshal.c,1.51,1.52 modsupport.c,2.47,2.48 pythonrun.c,2.100,2.101 sysmodule.c,2.68,2.69

Tim Peters python-dev@python.org
Sat, 8 Jul 2000 20:09:59 -0700


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

Modified Files:
	bltinmodule.c ceval.c compile.c errors.c getargs.c import.c 
	importdl.h marshal.c modsupport.c pythonrun.c sysmodule.c 
Log Message:
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.168
retrieving revision 2.169
diff -C2 -r2.168 -r2.169
*** bltinmodule.c	2000/07/09 02:11:18	2.168
--- bltinmodule.c	2000/07/09 03:09:56	2.169
***************
*** 29,34 ****
  
  /* Forward */
! static PyObject *filterstring Py_PROTO((PyObject *, PyObject *));
! static PyObject *filtertuple  Py_PROTO((PyObject *, PyObject *));
  
  static PyObject *
--- 29,34 ----
  
  /* Forward */
! static PyObject *filterstring(PyObject *, PyObject *);
! static PyObject *filtertuple (PyObject *, PyObject *);
  
  static PyObject *
***************
*** 429,433 ****
  	PyObject *v;
  {
! 	extern double strtod Py_PROTO((const char *, char **));
  	const char *s, *start;
  	char *end;
--- 429,433 ----
  	PyObject *v;
  {
! 	extern double strtod(const char *, char **);
  	const char *s, *start;
  	char *end;
***************
*** 1226,1230 ****
  
  
! static PyObject *builtin_raw_input Py_PROTO((PyObject *, PyObject *));
  
  static PyObject *
--- 1226,1230 ----
  
  
! static PyObject *builtin_raw_input(PyObject *, PyObject *);
  
  static PyObject *

Index: ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.182
retrieving revision 2.183
diff -C2 -r2.182 -r2.183
*** ceval.c	2000/06/30 23:58:05	2.182
--- ceval.c	2000/07/09 03:09:56	2.183
***************
*** 44,75 ****
  /* Forward declarations */
  
! static PyObject *eval_code2 Py_PROTO((PyCodeObject *,
! 				 PyObject *, PyObject *,
! 				 PyObject **, int,
! 				 PyObject **, int,
! 				 PyObject **, int,
! 				 PyObject *));
  #ifdef LLTRACE
! static int prtrace Py_PROTO((PyObject *, char *));
  #endif
! static void call_exc_trace Py_PROTO((PyObject **, PyObject**,
! 				     PyFrameObject *));
! static int call_trace Py_PROTO((PyObject **, PyObject **,
! 				PyFrameObject *, char *, PyObject *));
! static PyObject *call_builtin Py_PROTO((PyObject *, PyObject *, PyObject *));
! static PyObject *call_function Py_PROTO((PyObject *, PyObject *, PyObject *));
! static PyObject *loop_subscript Py_PROTO((PyObject *, PyObject *));
! static PyObject *apply_slice Py_PROTO((PyObject *, PyObject *, PyObject *));
! static int assign_slice Py_PROTO((PyObject *, PyObject *,
! 				  PyObject *, PyObject *));
! static PyObject *cmp_outcome Py_PROTO((int, PyObject *, PyObject *));
! static int import_from Py_PROTO((PyObject *, PyObject *, PyObject *));
! static PyObject *build_class Py_PROTO((PyObject *, PyObject *, PyObject *));
! static int exec_statement Py_PROTO((PyFrameObject *,
! 				    PyObject *, PyObject *, PyObject *));
! static PyObject *find_from_args Py_PROTO((PyFrameObject *, int));
! static void set_exc_info Py_PROTO((PyThreadState *,
! 				PyObject *, PyObject *, PyObject *));
! static void reset_exc_info Py_PROTO((PyThreadState *));
  
  
--- 44,73 ----
  /* Forward declarations */
  
! static PyObject *eval_code2(PyCodeObject *,
! 			    PyObject *, PyObject *,
! 			    PyObject **, int,
! 			    PyObject **, int,
! 			    PyObject **, int,
! 			    PyObject *);
  #ifdef LLTRACE
! static int prtrace(PyObject *, char *);
  #endif
! static void call_exc_trace(PyObject **, PyObject**, PyFrameObject *);
! static int call_trace(PyObject **, PyObject **,
! 		      PyFrameObject *, char *, PyObject *);
! static PyObject *call_builtin(PyObject *, PyObject *, PyObject *);
! static PyObject *call_function(PyObject *, PyObject *, PyObject *);
! static PyObject *loop_subscript(PyObject *, PyObject *);
! static PyObject *apply_slice(PyObject *, PyObject *, PyObject *);
! static int assign_slice(PyObject *, PyObject *,
! 			PyObject *, PyObject *);
! static PyObject *cmp_outcome(int, PyObject *, PyObject *);
! static int import_from(PyObject *, PyObject *, PyObject *);
! static PyObject *build_class(PyObject *, PyObject *, PyObject *);
! static int exec_statement(PyFrameObject *,
! 			  PyObject *, PyObject *, PyObject *);
! static PyObject *find_from_args(PyFrameObject *, int);
! static void set_exc_info(PyThreadState *, PyObject *, PyObject *, PyObject *);
! static void reset_exc_info(PyThreadState *);
  
  
***************
*** 212,216 ****
  #define NPENDINGCALLS 32
  static struct {
! 	int (*func) Py_PROTO((ANY *));
  	ANY *arg;
  } pendingcalls[NPENDINGCALLS];
--- 210,214 ----
  #define NPENDINGCALLS 32
  static struct {
! 	int (*func)(ANY *);
  	ANY *arg;
  } pendingcalls[NPENDINGCALLS];
***************
*** 221,225 ****
  int
  Py_AddPendingCall(func, arg)
! 	int (*func) Py_PROTO((ANY *));
  	ANY *arg;
  {
--- 219,223 ----
  int
  Py_AddPendingCall(func, arg)
! 	int (*func)(ANY *);
  	ANY *arg;
  {
***************
*** 259,263 ****
  	for (;;) {
  		int i;
! 		int (*func) Py_PROTO((ANY *));
  		ANY *arg;
  		i = pendingfirst;
--- 257,261 ----
  	for (;;) {
  		int i;
! 		int (*func)(ANY *);
  		ANY *arg;
  		i = pendingfirst;
***************
*** 288,293 ****
  };
  
! static enum why_code do_raise Py_PROTO((PyObject *, PyObject *, PyObject *));
! static int unpack_sequence Py_PROTO((PyObject *, int, PyObject **));
  
  
--- 286,291 ----
  };
  
! static enum why_code do_raise(PyObject *, PyObject *, PyObject *);
! static int unpack_sequence(PyObject *, int, PyObject **);
  
  

Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.113
retrieving revision 2.114
diff -C2 -r2.113 -r2.114
*** compile.c	2000/07/03 21:39:47	2.113
--- compile.c	2000/07/09 03:09:56	2.114
***************
*** 376,403 ****
  /* Prototype forward declarations */
  
! static int com_init Py_PROTO((struct compiling *, char *));
! static void com_free Py_PROTO((struct compiling *));
! static void com_push Py_PROTO((struct compiling *, int));
! static void com_pop Py_PROTO((struct compiling *, int));
! static void com_done Py_PROTO((struct compiling *));
! static void com_node Py_PROTO((struct compiling *, struct _node *));
! static void com_factor Py_PROTO((struct compiling *, struct _node *));
! static void com_addbyte Py_PROTO((struct compiling *, int));
! static void com_addint Py_PROTO((struct compiling *, int));
! static void com_addoparg Py_PROTO((struct compiling *, int, int));
! static void com_addfwref Py_PROTO((struct compiling *, int, int *));
! static void com_backpatch Py_PROTO((struct compiling *, int));
! static int com_add Py_PROTO((struct compiling *, PyObject *, PyObject *, PyObject *));
! static int com_addconst Py_PROTO((struct compiling *, PyObject *));
! static int com_addname Py_PROTO((struct compiling *, PyObject *));
! static void com_addopname Py_PROTO((struct compiling *, int, node *));
! static void com_list Py_PROTO((struct compiling *, node *, int));
! static int com_argdefs Py_PROTO((struct compiling *, node *));
! static int com_newlocal Py_PROTO((struct compiling *, char *));
! static PyCodeObject *icompile Py_PROTO((struct _node *, struct compiling *));
! static PyCodeObject *jcompile Py_PROTO((struct _node *, char *,
! 					struct compiling *));
! static PyObject *parsestrplus Py_PROTO((node *));
! static PyObject *parsestr Py_PROTO((char *));
  
  static int
--- 376,403 ----
  /* Prototype forward declarations */
  
! static int com_init(struct compiling *, char *);
! static void com_free(struct compiling *);
! static void com_push(struct compiling *, int);
! static void com_pop(struct compiling *, int);
! static void com_done(struct compiling *);
! static void com_node(struct compiling *, struct _node *);
! static void com_factor(struct compiling *, struct _node *);
! static void com_addbyte(struct compiling *, int);
! static void com_addint(struct compiling *, int);
! static void com_addoparg(struct compiling *, int, int);
! static void com_addfwref(struct compiling *, int, int *);
! static void com_backpatch(struct compiling *, int);
! static int com_add(struct compiling *, PyObject *, PyObject *, PyObject *);
! static int com_addconst(struct compiling *, PyObject *);
! static int com_addname(struct compiling *, PyObject *);
! static void com_addopname(struct compiling *, int, node *);
! static void com_list(struct compiling *, node *, int);
! static int com_argdefs(struct compiling *, node *);
! static int com_newlocal(struct compiling *, char *);
! static PyCodeObject *icompile(struct _node *, struct compiling *);
! static PyCodeObject *jcompile(struct _node *, char *,
! 			      struct compiling *);
! static PyObject *parsestrplus(node *);
! static PyObject *parsestr(char *);
  
  static int
***************
*** 814,818 ****
  	char *s;
  {
! 	extern double atof Py_PROTO((const char *));
  	char *end;
  	long x;
--- 814,818 ----
  	char *s;
  {
! 	extern double atof(const char *);
  	char *end;
  	long x;
***************
*** 1824,1829 ****
  /* Begin of assignment compilation */
  
! static void com_assign_name Py_PROTO((struct compiling *, node *, int));
! static void com_assign Py_PROTO((struct compiling *, node *, int));
  
  static void
--- 1824,1829 ----
  /* Begin of assignment compilation */
  
! static void com_assign_name(struct compiling *, node *, int);
! static void com_assign(struct compiling *, node *, int);
  
  static void
***************
*** 2014,2018 ****
  }
  
! /* Forward */ static node *get_rawdocstring Py_PROTO((node *));
  
  static void
--- 2014,2018 ----
  }
  
! /* Forward */ static node *get_rawdocstring(node *);
  
  static void
***************
*** 3042,3046 ****
  }
  
! static void com_fplist Py_PROTO((struct compiling *, node *));
  
  static void
--- 3042,3046 ----
  }
  
! static void com_fplist(struct compiling *, node *);
  
  static void

Index: errors.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/errors.c,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -r2.47 -r2.48
*** errors.c	2000/06/30 23:58:06	2.47
--- errors.c	2000/07/09 03:09:56	2.48
***************
*** 18,22 ****
  
  #ifdef macintosh
! extern char *PyMac_StrError Py_PROTO((int));
  #undef strerror
  #define strerror PyMac_StrError
--- 18,22 ----
  
  #ifdef macintosh
! extern char *PyMac_StrError(int);
  #undef strerror
  #define strerror PyMac_StrError
***************
*** 25,29 ****
  #ifndef __STDC__
  #ifndef MS_WINDOWS
! extern char *strerror Py_PROTO((int));
  #endif
  #endif
--- 25,29 ----
  #ifndef __STDC__
  #ifndef MS_WINDOWS
! extern char *strerror(int);
  #endif
  #endif

Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.38
retrieving revision 2.39
diff -C2 -r2.38 -r2.39
*** getargs.c	2000/07/06 12:22:00	2.38
--- getargs.c	2000/07/09 03:09:56	2.39
***************
*** 24,47 ****
  
  
! int PyArg_Parse Py_PROTO((PyObject *, char *, ...));
! int PyArg_ParseTuple Py_PROTO((PyObject *, char *, ...));
! int PyArg_VaParse Py_PROTO((PyObject *, char *, va_list));
  
! int PyArg_ParseTupleAndKeywords Py_PROTO((PyObject *, PyObject *,
! 				       char *, char **, ...));
  
  /* Forward */
! static int vgetargs1 Py_PROTO((PyObject *, char *, va_list *, int));
! static void seterror Py_PROTO((int, char *, int *, char *, char *));
! static char *convertitem Py_PROTO((PyObject *, char **, va_list *,
! 				   int *, char *));
! static char *converttuple Py_PROTO((PyObject *, char **, va_list *,
! 				 int *, char *, int));
! static char *convertsimple Py_PROTO((PyObject *, char **, va_list *, char *));
! static char *convertsimple1 Py_PROTO((PyObject *, char **, va_list *));
! 
! static int vgetargskeywords Py_PROTO((PyObject *, PyObject *,
! 				   char *, char **, va_list *));
! static char *skipitem Py_PROTO((char **, va_list *));
  
  #ifdef HAVE_STDARG_PROTOTYPES
--- 24,46 ----
  
  
! int PyArg_Parse(PyObject *, char *, ...);
! int PyArg_ParseTuple(PyObject *, char *, ...);
! int PyArg_VaParse(PyObject *, char *, va_list);
  
! int PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
! 				char *, char **, ...);
  
  /* Forward */
! static int vgetargs1(PyObject *, char *, va_list *, int);
! static void seterror(int, char *, int *, char *, char *);
! static char *convertitem(PyObject *, char **, va_list *, int *, char *);
! static char *converttuple(PyObject *, char **, va_list *,
! 			  int *, char *, int);
! static char *convertsimple(PyObject *, char **, va_list *, char *);
! static char *convertsimple1(PyObject *, char **, va_list *);
! 
! static int vgetargskeywords(PyObject *, PyObject *,
! 			    char *, char **, va_list *);
! static char *skipitem(char **, va_list *);
  
  #ifdef HAVE_STDARG_PROTOTYPES
***************
*** 887,892 ****
  			}
  			else if (*format == '&') {
! 				typedef int (*converter)
! 					Py_PROTO((PyObject *, void *));
  				converter convert = va_arg(*p_va, converter);
  				void *addr = va_arg(*p_va, void *);
--- 886,890 ----
  			}
  			else if (*format == '&') {
! 				typedef int (*converter)(PyObject *, void *);
  				converter convert = va_arg(*p_va, converter);
  				void *addr = va_arg(*p_va, void *);
***************
*** 1324,1329 ****
  #endif
  			else if (*format == '&') {
! 				typedef int (*converter)
! 					Py_PROTO((PyObject *, void *));
  				(void) va_arg(*p_va, converter);
  				(void) va_arg(*p_va, void *);
--- 1322,1326 ----
  #endif
  			else if (*format == '&') {
! 				typedef int (*converter)(PyObject *, void *);
  				(void) va_arg(*p_va, converter);
  				(void) va_arg(*p_va, void *);

Index: import.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/import.c,v
retrieving revision 2.139
retrieving revision 2.140
diff -C2 -r2.139 -r2.140
*** import.c	2000/07/01 01:06:56	2.139
--- import.c	2000/07/09 03:09:56	2.140
***************
*** 764,771 ****
  
  /* Forward */
! static PyObject *load_module Py_PROTO((char *, FILE *, char *, int));
! static struct filedescr *find_module Py_PROTO((char *, PyObject *,
! 					       char *, size_t, FILE **));
! static struct _frozen *find_frozen Py_PROTO((char *name));
  
  /* Load a package and return its module object WITH INCREMENTED
--- 764,771 ----
  
  /* Forward */
! static PyObject *load_module(char *, FILE *, char *, int);
! static struct filedescr *find_module(char *, PyObject *,
! 				     char *, size_t, FILE **);
! static struct _frozen *find_frozen(char *name);
  
  /* Load a package and return its module object WITH INCREMENTED
***************
*** 856,860 ****
  #endif
  
! static int find_init_module Py_PROTO((char *)); /* Forward */
  
  static struct filedescr *
--- 856,860 ----
  #endif
  
! static int find_init_module(char *); /* Forward */
  
  static struct filedescr *
***************
*** 1207,1211 ****
  
  
! static int init_builtin Py_PROTO((char *)); /* Forward */
  
  /* Load an external module using the default search path and return
--- 1207,1211 ----
  
  
! static int init_builtin(char *); /* Forward */
  
  /* Load an external module using the default search path and return
***************
*** 1456,1468 ****
  
  /* Forward declarations for helper routines */
! static PyObject *get_parent Py_PROTO((PyObject *globals,
! 				      char *buf, int *p_buflen));
! static PyObject *load_next Py_PROTO((PyObject *mod, PyObject *altmod,
! 				     char **p_name, char *buf, int *p_buflen));
! static int mark_miss Py_PROTO((char *name));
! static int ensure_fromlist Py_PROTO((PyObject *mod, PyObject *fromlist,
! 				     char *buf, int buflen, int recursive));
! static PyObject * import_submodule Py_PROTO((PyObject *mod,
! 					     char *name, char *fullname));
  
  /* The Magnum Opus of dotted-name import :-) */
--- 1456,1466 ----
  
  /* Forward declarations for helper routines */
! static PyObject *get_parent(PyObject *globals, char *buf, int *p_buflen);
! static PyObject *load_next(PyObject *mod, PyObject *altmod,
! 			   char **p_name, char *buf, int *p_buflen);
! static int mark_miss(char *name);
! static int ensure_fromlist(PyObject *mod, PyObject *fromlist,
! 			   char *buf, int buflen, int recursive);
! static PyObject * import_submodule(PyObject *mod, char *name, char *fullname);
  
  /* The Magnum Opus of dotted-name import :-) */
***************
*** 2007,2011 ****
  	PyObject *path; /* list or None or NULL */
  {
! 	extern int fclose Py_PROTO((FILE *));
  	PyObject *fob, *ret;
  	struct filedescr *fdp;
--- 2005,2009 ----
  	PyObject *path; /* list or None or NULL */
  {
! 	extern int fclose(FILE *);
  	PyObject *fob, *ret;
  	struct filedescr *fdp;

Index: importdl.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/importdl.h,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** importdl.h	2000/06/30 23:58:06	2.14
--- importdl.h	2000/07/09 03:09:56	2.15
***************
*** 37,42 ****
  extern const struct filedescr _PyImport_DynLoadFiletab[];
  
! extern PyObject *_PyImport_LoadDynamicModule
! 	Py_PROTO((char *name, char *pathname, FILE *));
  
  /* Max length of module suffix searched for -- accommodates "module.slb" */
--- 37,42 ----
  extern const struct filedescr _PyImport_DynLoadFiletab[];
  
! extern PyObject *_PyImport_LoadDynamicModule(char *name, char *pathname,
! 					     FILE *);
  
  /* Max length of module suffix searched for -- accommodates "module.slb" */

Index: marshal.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/marshal.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** marshal.c	2000/06/30 23:58:06	1.51
--- marshal.c	2000/07/09 03:09:56	1.52
***************
*** 172,177 ****
  	}
  	else if (PyFloat_Check(v)) {
! 		extern void PyFloat_AsString
! 			Py_PROTO((char *, PyFloatObject *));
  		char buf[256]; /* Plenty to format any double */
  		PyFloat_AsString(buf, (PyFloatObject *)v);
--- 172,176 ----
  	}
  	else if (PyFloat_Check(v)) {
! 		extern void PyFloat_AsString(char *, PyFloatObject *);
  		char buf[256]; /* Plenty to format any double */
  		PyFloat_AsString(buf, (PyFloatObject *)v);
***************
*** 183,188 ****
  #ifndef WITHOUT_COMPLEX
  	else if (PyComplex_Check(v)) {
! 		extern void PyFloat_AsString
! 			Py_PROTO((char *, PyFloatObject *));
  		char buf[256]; /* Plenty to format any double */
  		PyFloatObject *temp;
--- 182,186 ----
  #ifndef WITHOUT_COMPLEX
  	else if (PyComplex_Check(v)) {
! 		extern void PyFloat_AsString(char *, PyFloatObject *);
  		char buf[256]; /* Plenty to format any double */
  		PyFloatObject *temp;
***************
*** 439,443 ****
  	case TYPE_FLOAT:
  		{
! 			extern double atof Py_PROTO((const char *));
  			char buf[256];
  			double dx;
--- 437,441 ----
  	case TYPE_FLOAT:
  		{
! 			extern double atof(const char *);
  			char buf[256];
  			double dx;
***************
*** 458,462 ****
  	case TYPE_COMPLEX:
  		{
! 			extern double atof Py_PROTO((const char *));
  			char buf[256];
  			Py_complex c;
--- 456,460 ----
  	case TYPE_COMPLEX:
  		{
! 			extern double atof(const char *);
  			char buf[256];
  			Py_complex c;

Index: modsupport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/modsupport.c,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -r2.47 -r2.48
*** modsupport.c	2000/07/06 12:22:00	2.47
--- modsupport.c	2000/07/09 03:09:56	2.48
***************
*** 85,89 ****
  /* Helper for mkvalue() to scan the length of a format */
  
! static int countformat Py_PROTO((char *format, int endchar));
  static int countformat(format, endchar)
  	char *format;
--- 85,89 ----
  /* Helper for mkvalue() to scan the length of a format */
  
! static int countformat(char *format, int endchar);
  static int countformat(format, endchar)
  	char *format;
***************
*** 131,138 ****
  /* After an original idea and first implementation by Steven Miale */
  
! static PyObject *do_mktuple Py_PROTO((char**, va_list *, int, int));
! static PyObject *do_mklist Py_PROTO((char**, va_list *, int, int));
! static PyObject *do_mkdict Py_PROTO((char**, va_list *, int, int));
! static PyObject *do_mkvalue Py_PROTO((char**, va_list *));
  
  
--- 131,138 ----
  /* After an original idea and first implementation by Steven Miale */
  
! static PyObject *do_mktuple(char**, va_list *, int, int);
! static PyObject *do_mklist(char**, va_list *, int, int);
! static PyObject *do_mkdict(char**, va_list *, int, int);
! static PyObject *do_mkvalue(char**, va_list *);
  
  
***************
*** 359,363 ****
  		case 'O':
  		if (**p_format == '&') {
! 			typedef PyObject *(*converter) Py_PROTO((void *));
  			converter func = va_arg(*p_va, converter);
  			void *arg = va_arg(*p_va, void *);
--- 359,363 ----
  		case 'O':
  		if (**p_format == '&') {
! 			typedef PyObject *(*converter)(void *);
  			converter func = va_arg(*p_va, converter);
  			void *arg = va_arg(*p_va, void *);

Index: pythonrun.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/pythonrun.c,v
retrieving revision 2.100
retrieving revision 2.101
diff -C2 -r2.100 -r2.101
*** pythonrun.c	2000/06/30 23:58:06	2.100
--- pythonrun.c	2000/07/09 03:09:56	2.101
***************
*** 39,54 ****
  
  /* Forward */
! static void initmain Py_PROTO((void));
! static void initsite Py_PROTO((void));
! static PyObject *run_err_node Py_PROTO((node *n, char *filename,
! 				   PyObject *globals, PyObject *locals));
! static PyObject *run_node Py_PROTO((node *n, char *filename,
! 			       PyObject *globals, PyObject *locals));
! static PyObject *run_pyc_file Py_PROTO((FILE *fp, char *filename,
! 				   PyObject *globals, PyObject *locals));
! static void err_input Py_PROTO((perrdetail *));
! static void initsigs Py_PROTO((void));
! static void call_sys_exitfunc Py_PROTO((void));
! static void call_ll_exitfuncs Py_PROTO((void));
  
  #ifdef Py_TRACE_REFS
--- 39,54 ----
  
  /* Forward */
! static void initmain(void);
! static void initsite(void);
! static PyObject *run_err_node(node *n, char *filename,
! 			      PyObject *globals, PyObject *locals);
! static PyObject *run_node(node *n, char *filename,
! 			  PyObject *globals, PyObject *locals);
! static PyObject *run_pyc_file(FILE *fp, char *filename,
! 			      PyObject *globals, PyObject *locals);
! static void err_input(perrdetail *);
! static void initsigs(void);
! static void call_sys_exitfunc(void);
! static void call_ll_exitfuncs(void);
  
  #ifdef Py_TRACE_REFS
***************
*** 164,168 ****
  
  #ifdef COUNT_ALLOCS
! extern void dump_counts Py_PROTO((void));
  #endif
  
--- 164,168 ----
  
  #ifdef COUNT_ALLOCS
! extern void dump_counts(void);
  #endif
  
***************
*** 1060,1064 ****
  
  int Py_AtExit(func)
! 	void (*func) Py_PROTO((void));
  {
  	if (nexitfuncs >= NEXITFUNCS)
--- 1060,1064 ----
  
  int Py_AtExit(func)
! 	void (*func)(void);
  {
  	if (nexitfuncs >= NEXITFUNCS)

Index: sysmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.68
retrieving revision 2.69
diff -C2 -r2.68 -r2.69
*** sysmodule.c	2000/06/30 23:58:06	2.68
--- sysmodule.c	2000/07/09 03:09:56	2.69
***************
*** 271,275 ****
  	PyObject *self, *args;
  {
! 	extern PyObject *get_counts Py_PROTO((void));
  
  	if (!PyArg_ParseTuple(args, ":getcounts"))
--- 271,275 ----
  	PyObject *self, *args;
  {
! 	extern PyObject *get_counts(void);
  
  	if (!PyArg_ParseTuple(args, ":getcounts"))
***************
*** 281,290 ****
  #ifdef Py_TRACE_REFS
  /* Defined in objects.c because it uses static globals if that file */
! extern PyObject *_Py_GetObjects Py_PROTO((PyObject *, PyObject *));
  #endif
  
  #ifdef DYNAMIC_EXECUTION_PROFILE
  /* Defined in ceval.c because it uses static globals if that file */
! extern PyObject *_Py_GetDXProfile Py_PROTO((PyObject *,  PyObject *));
  #endif
  
--- 281,290 ----
  #ifdef Py_TRACE_REFS
  /* Defined in objects.c because it uses static globals if that file */
! extern PyObject *_Py_GetObjects(PyObject *, PyObject *);
  #endif
  
  #ifdef DYNAMIC_EXECUTION_PROFILE
  /* Defined in ceval.c because it uses static globals if that file */
! extern PyObject *_Py_GetDXProfile(PyObject *,  PyObject *);
  #endif
  
***************
*** 410,414 ****
  _PySys_Init()
  {
! 	extern int fclose Py_PROTO((FILE *));
  	PyObject *m, *v, *sysdict;
  	PyObject *sysin, *sysout, *syserr;
--- 410,414 ----
  _PySys_Init()
  {
! 	extern int fclose(FILE *);
  	PyObject *m, *v, *sysdict;
  	PyObject *sysin, *sysout, *syserr;