[Python-checkins] CVS: python/dist/src/Include ceval.h,2.34,2.35 import.h,2.25,2.26 modsupport.h,2.32,2.33 pgenheaders.h,2.20,2.21 sysmodule.h,2.20,2.21 unicodeobject.h,2.15,2.16

[Thomas Wouters]

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

Modified Files:
	ceval.h import.h modsupport.h pgenheaders.h sysmodule.h 
	unicodeobject.h 
Log Message:

ANSIfications: fix empty arglists, and remove the checks for
'HAVE_STDARG_PROTOTYPES' (consider it true, remove false branch)



Index: ceval.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v
retrieving revision 2.34
retrieving revision 2.35
diff -C2 -r2.34 -r2.35
*** ceval.h	2000/07/08 23:37:28	2.34
--- ceval.h	2000/07/22 23:30:03	2.35
***************
*** 28,40 ****
          PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
  
- #ifdef HAVE_STDARG_PROTOTYPES
  DL_IMPORT(PyObject *) PyEval_CallFunction(PyObject *obj, char *format, ...);
  DL_IMPORT(PyObject *) PyEval_CallMethod(PyObject *obj,
                                          char *methodname, char *format, ...);
- #else
- /* Better to have no prototypes at all for varargs functions in this case */
- DL_IMPORT(PyObject *) PyEval_CallFunction();
- DL_IMPORT(PyObject *) PyEval_CallMethod();
- #endif
  
  DL_IMPORT(PyObject *) PyEval_GetBuiltins(void);
--- 28,34 ----

Index: import.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/import.h,v
retrieving revision 2.25
retrieving revision 2.26
diff -C2 -r2.25 -r2.26
*** import.h	2000/07/08 23:37:28	2.25
--- import.h	2000/07/22 23:30:03	2.26
***************
*** 36,45 ****
  struct _inittab {
      char *name;
!     void (*initfunc)();
  };
  
  extern DL_IMPORT(struct _inittab *) PyImport_Inittab;
  
! extern DL_IMPORT(int) PyImport_AppendInittab(char *name, void (*initfunc)());
  extern DL_IMPORT(int) PyImport_ExtendInittab(struct _inittab *newtab);
  
--- 36,45 ----
  struct _inittab {
      char *name;
!     void (*initfunc)(void);
  };
  
  extern DL_IMPORT(struct _inittab *) PyImport_Inittab;
  
! extern DL_IMPORT(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));
  extern DL_IMPORT(int) PyImport_ExtendInittab(struct _inittab *newtab);
  

Index: modsupport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/modsupport.h,v
retrieving revision 2.32
retrieving revision 2.33
diff -C2 -r2.32 -r2.33
*** modsupport.h	2000/07/16 12:04:30	2.32
--- modsupport.h	2000/07/22 23:30:03	2.33
***************
*** 17,22 ****
  /* Module support interface */
  
- #ifdef HAVE_STDARG_PROTOTYPES
- 
  #include <stdarg.h>
  
--- 17,20 ----
***************
*** 26,40 ****
                                                    char *, char **, ...);
  extern DL_IMPORT(PyObject *) Py_BuildValue(char *, ...);
- 
- #else
- 
- #include <varargs.h>
- 
- /* Better to have no prototypes at all for varargs functions in this case */
- extern DL_IMPORT(int) PyArg_Parse();
- extern DL_IMPORT(int) PyArg_ParseTuple();
- extern DL_IMPORT(PyObject *) Py_BuildValue();
- 
- #endif
  
  extern DL_IMPORT(int) PyArg_VaParse(PyObject *, char *, va_list);
--- 24,27 ----

Index: pgenheaders.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/pgenheaders.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** pgenheaders.h	2000/06/30 23:58:04	2.20
--- pgenheaders.h	2000/07/22 23:30:03	2.21
***************
*** 36,47 ****
  #include "pydebug.h"
  
- #ifdef HAVE_STDARG_PROTOTYPES
  DL_IMPORT(void) PySys_WriteStdout(const char *format, ...);
  DL_IMPORT(void) PySys_WriteStderr(const char *format, ...);
- #else
- /* Better to have no prototypes at all for varargs functions in this case */
- DL_IMPORT(void) PySys_WriteStdout();
- DL_IMPORT(void) PySys_WriteStderr();
- #endif
  
  #define addarc _Py_addarc
--- 36,41 ----

Index: sysmodule.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/sysmodule.h,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** sysmodule.h	2000/07/09 00:55:06	2.20
--- sysmodule.h	2000/07/22 23:30:03	2.21
***************
*** 23,34 ****
  DL_IMPORT(void) PySys_SetPath(char *);
  
- #ifdef HAVE_STDARG_PROTOTYPES
  DL_IMPORT(void) PySys_WriteStdout(const char *format, ...);
  DL_IMPORT(void) PySys_WriteStderr(const char *format, ...);
- #else
- /* Better to have no prototypes at all for varargs functions in this case */
- DL_IMPORT(void) PySys_WriteStdout();
- DL_IMPORT(void) PySys_WriteStderr();
- #endif
  
  extern DL_IMPORT(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc;
--- 23,28 ----

Index: unicodeobject.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/unicodeobject.h,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** unicodeobject.h	2000/07/16 12:04:30	2.15
--- unicodeobject.h	2000/07/22 23:30:03	2.16
***************
*** 377,381 ****
   */
  
! extern DL_IMPORT(const char*) PyUnicode_GetDefaultEncoding();
  
  /* Sets the currently active default encoding.
--- 377,381 ----
   */
  
! extern DL_IMPORT(const char*) PyUnicode_GetDefaultEncoding(void);
  
  /* Sets the currently active default encoding.