languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 00:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ANSIfication: remove very-old-varargs code, fix function declarations so

Browse source 
they include prototypes.
This commit is contained in:
Thomas Wouters 2000-07-22 23:59:33 +00:00
parent bd4bc4e9e9
commit a534594fc7
4 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Objects/abstract.c
View file

@ -298,8 +298,6 @@ PyNumber_Check(PyObject *o)
PyObject *
PyNumber_Or(PyObject *v, PyObject *w)
{
extern int PyNumber_Coerce();
BINOP(v, w, "__or__", "__ror__", PyNumber_Or);
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
@ -319,8 +317,6 @@ PyNumber_Or(PyObject *v, PyObject *w)
PyObject *
PyNumber_Xor(PyObject *v, PyObject *w)
{
extern int PyNumber_Coerce();
BINOP(v, w, "__xor__", "__rxor__", PyNumber_Xor);
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
@ -1391,25 +1387,11 @@ PyObject_CallObject(PyObject *o, PyObject *a)
}
PyObject *
#ifdef HAVE_STDARG_PROTOTYPES
/* VARARGS 2 */
PyObject_CallFunction(PyObject *callable, char *format, ...)
#else
/* VARARGS */
PyObject_CallFunction(va_alist) va_dcl
#endif
{
va_list va;
PyObject *args, *retval;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
#else
PyObject *callable;
char *format;
va_start(va);
callable = va_arg(va, PyObject *);
format = va_arg(va, char *);
#endif
if (callable == NULL) {
va_end(va);
@ -1444,27 +1426,11 @@ PyObject_CallFunction(PyObject *callable, char *format, ...)
}
PyObject *
#ifdef HAVE_STDARG_PROTOTYPES
/* VARARGS 2 */
PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
#else
/* VARARGS */
PyObject_CallMethod(va_alist) va_dcl
#endif
{
va_list va;
PyObject *args, *func = 0, *retval;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(va, format);
#else
PyObject *o;
char *name;
char *format;
va_start(va);
o = va_arg(va, PyObject *);
name = va_arg(va, char *);
format = va_arg(va, char *);
#endif
if (o == NULL || name == NULL) {
va_end(va);

2
PC/WinMain.c
View file

@ -5,7 +5,7 @@
#include "Python.h"
extern int Py_Main();
extern int Py_Main(int, char **);
int WINAPI WinMain(
HINSTANCE hInstance, /* handle to current instance */

2
PC/getpathp.c
View file

@ -336,7 +336,7 @@ getpythonregpath(HKEY keyBase, int skipcore)
static void
get_progpath(void)
{
extern char *Py_GetProgramName();
extern char *Py_GetProgramName(void);
char *path = getenv("PATH");
char *prog = Py_GetProgramName();

4
PC/os2vacpp/getpathp.c
View file

@ -16,7 +16,7 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#ifdef MS_WIN32
#include <windows.h>
extern BOOL PyWin_IsWin32s();
extern BOOL PyWin_IsWin32s(void);
#endif
#include <sys/types.h>
@ -242,7 +242,7 @@ getpythonregpath(HKEY keyBase, BOOL bWin32s)
static void
get_progpath(void)
{
extern char *Py_GetProgramName();
extern char *Py_GetProgramName(void);
char *path = getenv("PATH");
char *prog = Py_GetProgramName();