[Python-checkins] CVS: python/dist/src/Objects abstract.c,2.37,2.38 classobject.c,2.98,2.99 cobject.c,2.10,2.11 fileobject.c,2.78,2.79 floatobject.c,2.61,2.62 object.c,2.83,2.84
Tim Peters
python-dev@python.org
Sat, 8 Jul 2000 20:09:58 -0700
- Previous message: [Python-checkins] CVS: python/dist/src/Include cStringIO.h,2.11,2.12 methodobject.h,2.19,2.20 mymalloc.h,2.21,2.22 mymath.h,2.9,2.10 myproto.h,2.8,2.9
- Next message: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.46,2.47 cgensupport.h,2.13,2.14 cmathmodule.c,2.13,2.14 glmodule.c,2.5,2.6 mpzmodule.c,2.27,2.28 nismodule.c,2.16,2.17 readline.c,2.19,2.20 rgbimgmodule.c,2.18,2.19 signalmodule.c,2.44,2.45 socketmodule.c,1.113,1.114 stropmodule.c,2.65,2.66 structmodule.c,2.33,2.34 svmodule.c,2.13,2.14 timemodule.c,2.89,2.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8264/python/dist/src/Objects
Modified Files:
abstract.c classobject.c cobject.c fileobject.c floatobject.c
object.c
Log Message:
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** abstract.c 2000/06/30 23:58:05 2.37
--- abstract.c 2000/07/09 03:09:56 2.38
***************
*** 311,315 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 311,315 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 333,337 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 333,337 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 353,357 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 353,357 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 373,377 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 373,377 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 393,397 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 393,397 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 418,422 ****
else if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 418,422 ----
else if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 438,442 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 438,442 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 470,474 ****
if (tp->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyInstance_Check(v)) {
/* Instances of user-defined classes get their
--- 470,474 ----
if (tp->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyInstance_Check(v)) {
/* Instances of user-defined classes get their
***************
*** 516,520 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 516,520 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 540,544 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 540,544 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 560,564 ****
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *));
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
--- 560,564 ----
if (v->ob_type->tp_as_number != NULL) {
PyObject *x = NULL;
! PyObject * (*f)(PyObject *, PyObject *);
if (PyNumber_Coerce(&v, &w) != 0)
return NULL;
***************
*** 580,584 ****
{
PyObject *res;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *, PyObject *));
BINOP(v, w, "__pow__", "__rpow__", do_pow);
if (v->ob_type->tp_as_number == NULL ||
--- 580,584 ----
{
PyObject *res;
! PyObject * (*f)(PyObject *, PyObject *, PyObject *);
BINOP(v, w, "__pow__", "__rpow__", do_pow);
if (v->ob_type->tp_as_number == NULL ||
***************
*** 605,609 ****
PyObject *res;
PyObject *v1, *z1, *w2, *z2;
! PyObject * (*f) Py_FPROTO((PyObject *, PyObject *, PyObject *));
if (z == Py_None)
--- 605,609 ----
PyObject *res;
PyObject *v1, *z1, *w2, *z2;
! PyObject * (*f)(PyObject *, PyObject *, PyObject *);
if (z == Py_None)
Index: classobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/classobject.c,v
retrieving revision 2.98
retrieving revision 2.99
diff -C2 -r2.98 -r2.99
*** classobject.c 2000/07/08 12:04:57 2.98
--- classobject.c 2000/07/09 03:09:56 2.99
***************
*** 15,22 ****
/* Forward */
! static PyObject *class_lookup
! Py_PROTO((PyClassObject *, PyObject *, PyClassObject **));
! static PyObject *instance_getattr1 Py_PROTO((PyInstanceObject *, PyObject *));
! static PyObject *instance_getattr2 Py_PROTO((PyInstanceObject *, PyObject *));
static PyObject *getattrstr, *setattrstr, *delattrstr;
--- 15,22 ----
/* Forward */
! static PyObject *class_lookup(PyClassObject *, PyObject *,
! PyClassObject **);
! static PyObject *instance_getattr1(PyInstanceObject *, PyObject *);
! static PyObject *instance_getattr2(PyInstanceObject *, PyObject *);
static PyObject *getattrstr, *setattrstr, *delattrstr;
***************
*** 1204,1209 ****
/* Forward */
! static int halfbinop Py_PROTO((PyObject *, PyObject *, char *, PyObject **,
! PyObject * (*) Py_PROTO((PyObject *, PyObject *)), int ));
--- 1204,1209 ----
/* Forward */
! static int halfbinop(PyObject *, PyObject *, char *, PyObject **,
! PyObject * (*)(PyObject *, PyObject *), int);
***************
*** 1216,1220 ****
char *opname;
char *ropname;
! PyObject * (*thisfunc) Py_PROTO((PyObject *, PyObject *));
{
char buf[256];
--- 1216,1220 ----
char *opname;
char *ropname;
! PyObject * (*thisfunc)(PyObject *, PyObject *);
{
char buf[256];
***************
*** 1250,1254 ****
char *opname;
PyObject **r_result;
! PyObject * (*thisfunc) Py_PROTO((PyObject *, PyObject *));
int swapped;
{
--- 1250,1254 ----
char *opname;
PyObject **r_result;
! PyObject * (*thisfunc)(PyObject *, PyObject *);
int swapped;
{
Index: cobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/cobject.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -r2.10 -r2.11
*** cobject.c 2000/06/30 23:58:05 2.10
--- cobject.c 2000/07/09 03:09:56 2.11
***************
*** 16,21 ****
/* Declarations for objects of type PyCObject */
! typedef void (*destructor1) Py_PROTO((void *));
! typedef void (*destructor2) Py_PROTO((void *, void*));
typedef struct {
--- 16,21 ----
/* Declarations for objects of type PyCObject */
! typedef void (*destructor1)(void *);
! typedef void (*destructor2)(void *, void*);
typedef struct {
***************
*** 23,27 ****
void *cobject;
void *desc;
! void (*destructor) Py_PROTO((void *));
} PyCObject;
--- 23,27 ----
void *cobject;
void *desc;
! void (*destructor)(void *);
} PyCObject;
***************
*** 29,33 ****
PyCObject_FromVoidPtr(cobj, destr)
void *cobj;
! void (*destr) Py_PROTO((void *));
{
PyCObject *self;
--- 29,33 ----
PyCObject_FromVoidPtr(cobj, destr)
void *cobj;
! void (*destr)(void *);
{
PyCObject *self;
***************
*** 46,50 ****
void *cobj;
void *desc;
! void (*destr) Py_PROTO((void *, void *));
{
PyCObject *self;
--- 46,50 ----
void *cobj;
void *desc;
! void (*destr)(void *, void *);
{
PyCObject *self;
Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.78
retrieving revision 2.79
diff -C2 -r2.78 -r2.79
*** fileobject.c 2000/07/05 15:32:40 2.78
--- fileobject.c 2000/07/09 03:09:56 2.79
***************
*** 70,74 ****
PyObject *f_name;
PyObject *f_mode;
! int (*f_close) Py_PROTO((FILE *));
int f_softspace; /* Flag used by 'print' command */
int f_binary; /* Flag which indicates whether the file is open
--- 70,74 ----
PyObject *f_name;
PyObject *f_mode;
! int (*f_close)(FILE *);
int f_softspace; /* Flag used by 'print' command */
int f_binary; /* Flag which indicates whether the file is open
***************
*** 101,105 ****
char *name;
char *mode;
! int (*close) Py_FPROTO((FILE *));
{
PyFileObject *f = PyObject_NEW(PyFileObject, &PyFile_Type);
--- 101,105 ----
char *name;
char *mode;
! int (*close)(FILE *);
{
PyFileObject *f = PyObject_NEW(PyFileObject, &PyFile_Type);
***************
*** 127,131 ****
char *name, *mode;
{
! extern int fclose Py_PROTO((FILE *));
PyFileObject *f;
f = (PyFileObject *) PyFile_FromFile((FILE *)NULL, name, mode, fclose);
--- 127,131 ----
char *name, *mode;
{
! extern int fclose(FILE *);
PyFileObject *f;
f = (PyFileObject *) PyFile_FromFile((FILE *)NULL, name, mode, fclose);
Index: floatobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
retrieving revision 2.61
retrieving revision 2.62
diff -C2 -r2.61 -r2.62
*** floatobject.c 2000/06/30 23:58:05 2.61
--- floatobject.c 2000/07/09 03:09:56 2.62
***************
*** 65,70 ****
#if !defined(__STDC__) && !defined(macintosh)
! extern double fmod Py_PROTO((double, double));
! extern double pow Py_PROTO((double, double));
#endif
--- 65,70 ----
#if !defined(__STDC__) && !defined(macintosh)
! extern double fmod(double, double);
! extern double pow(double, double);
#endif
***************
*** 138,142 ****
char **pend;
{
! extern double strtod Py_PROTO((const char *, char **));
const char *s, *last, *end;
double x;
--- 138,142 ----
char **pend;
{
! extern double strtod(const char *, char **);
const char *s, *last, *end;
double x;
Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.83
retrieving revision 2.84
diff -C2 -r2.83 -r2.84
*** object.c 2000/07/08 17:43:32 2.83
--- object.c 2000/07/09 03:09:56 2.84
***************
*** 1002,1006 ****
/* Hack to force loading of abstract.o */
! int (*_Py_abstract_hack) Py_FPROTO((PyObject *)) = &PyObject_Length;
--- 1002,1006 ----
/* Hack to force loading of abstract.o */
! int (*_Py_abstract_hack)(PyObject *) = &PyObject_Length;
- Previous message: [Python-checkins] CVS: python/dist/src/Include cStringIO.h,2.11,2.12 methodobject.h,2.19,2.20 mymalloc.h,2.21,2.22 mymath.h,2.9,2.10 myproto.h,2.8,2.9
- Next message: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.46,2.47 cgensupport.h,2.13,2.14 cmathmodule.c,2.13,2.14 glmodule.c,2.5,2.6 mpzmodule.c,2.27,2.28 nismodule.c,2.16,2.17 readline.c,2.19,2.20 rgbimgmodule.c,2.18,2.19 signalmodule.c,2.44,2.45 socketmodule.c,1.113,1.114 stropmodule.c,2.65,2.66 structmodule.c,2.33,2.34 svmodule.c,2.13,2.14 timemodule.c,2.89,2.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]