[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

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

• Previous message: [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
• Next message: [Python-checkins] CVS: python/dist/src/Tools/freeze makefreeze.py,1.10,1.11
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8264/python/dist/src/Modules
Modified Files:
	arraymodule.c cgensupport.h cmathmodule.c glmodule.c 
	mpzmodule.c nismodule.c readline.c rgbimgmodule.c 
	signalmodule.c socketmodule.c stropmodule.c structmodule.c 
	svmodule.c timemodule.c 
Log Message:
Nuke all remaining occurrences of Py_PROTO and Py_FPROTO.
Index: arraymodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.46
retrieving revision 2.47
diff -C2 -r2.46 -r2.47
*** arraymodule.c	2000年07月01日 01:09:43	2.46
--- arraymodule.c	2000年07月09日 03:09:55	2.47
***************
*** 32,37 ****
 	int typecode;
 	int itemsize;
! 	PyObject * (*getitem) Py_FPROTO((struct arrayobject *, int));
! 	int (*setitem) Py_FPROTO((struct arrayobject *, int, PyObject *));
 };
 
--- 32,37 ----
 	int typecode;
 	int itemsize;
! 	PyObject * (*getitem)(struct arrayobject *, int);
! 	int (*setitem)(struct arrayobject *, int, PyObject *);
 };
 
***************
*** 47,59 ****
 
 /* Forward */
! static PyObject *newarrayobject Py_PROTO((int, struct arraydescr *));
 #if 0
! static int getarraysize Py_PROTO((PyObject *));
 #endif
! static PyObject *getarrayitem Py_PROTO((PyObject *, int));
! static int setarrayitem Py_PROTO((PyObject *, int, PyObject *));
 #if 0
! static int insarrayitem Py_PROTO((PyObject *, int, PyObject *));
! static int addarrayitem Py_PROTO((PyObject *, PyObject *));
 #endif
 
--- 47,59 ----
 
 /* Forward */
! static PyObject *newarrayobject(int, struct arraydescr *);
 #if 0
! static int getarraysize(PyObject *);
 #endif
! static PyObject *getarrayitem(PyObject *, int);
! static int setarrayitem(PyObject *, int, PyObject *);
 #if 0
! static int insarrayitem(PyObject *, int, PyObject *);
! static int addarrayitem(PyObject *, PyObject *);
 #endif
 
Index: cgensupport.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cgensupport.h,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** cgensupport.h	2000年06月30日 23:58:05	2.13
--- cgensupport.h	2000年07月09日 03:09:55	2.14
***************
*** 39,70 ****
 #define getistringarg PyArg_GetString
 
! extern int PyArg_GetObject Py_PROTO((PyObject *args, int nargs,
! 				 int i, PyObject **p_a));
! extern int PyArg_GetLong Py_PROTO((PyObject *args, int nargs,
! 				 int i, long *p_a));
! extern int PyArg_GetShort Py_PROTO((PyObject *args, int nargs,
! 				 int i, short *p_a));
! extern int PyArg_GetFloat Py_PROTO((PyObject *args, int nargs,
! 				 int i, float *p_a));
! extern int PyArg_GetString Py_PROTO((PyObject *args, int nargs,
! 				 int i, string *p_a));
! extern int PyArg_GetChar Py_PROTO((PyObject *args, int nargs,
! 				 int i, char *p_a));
! extern int PyArg_GetLongArray Py_PROTO((PyObject *args, int nargs,
! 					int i, int n, long *p_a));
! extern int PyArg_GetShortArray Py_PROTO((PyObject *args, int nargs,
! 					 int i, int n, short *p_a));
! extern int PyArg_GetDoubleArray Py_PROTO((PyObject *args, int nargs,
! 					 int i, int n, double *p_a));
! extern int PyArg_GetFloatArray Py_PROTO((PyObject *args, int nargs,
! 					 int i, int n, float *p_a));
! extern int PyArg_GetLongArraySize Py_PROTO((PyObject *args, int nargs,
! 					 int i, long *p_a));
! extern int PyArg_GetShortArraySize Py_PROTO((PyObject *args, int nargs,
! 					 int i, short *p_a));
! extern int PyArg_GetDoubleArraySize Py_PROTO((PyObject *args, int nargs,
! 					 int i, double *p_a));
! extern int PyArg_GetFloatArraySize Py_PROTO((PyObject *args, int nargs,
! 					 int i, float *p_a));
 
 #ifdef __cplusplus
--- 39,70 ----
 #define getistringarg PyArg_GetString
 
! extern int PyArg_GetObject(PyObject *args, int nargs,
! 			 int i, PyObject **p_a);
! extern int PyArg_GetLong(PyObject *args, int nargs,
! 			 int i, long *p_a);
! extern int PyArg_GetShort(PyObject *args, int nargs,
! 			 int i, short *p_a);
! extern int PyArg_GetFloat(PyObject *args, int nargs,
! 			 int i, float *p_a);
! extern int PyArg_GetString(PyObject *args, int nargs,
! 			 int i, string *p_a);
! extern int PyArg_GetChar(PyObject *args, int nargs,
! 			 int i, char *p_a);
! extern int PyArg_GetLongArray(PyObject *args, int nargs,
! 			 int i, int n, long *p_a);
! extern int PyArg_GetShortArray(PyObject *args, int nargs,
! 			 int i, int n, short *p_a);
! extern int PyArg_GetDoubleArray(PyObject *args, int nargs,
! 				int i, int n, double *p_a);
! extern int PyArg_GetFloatArray(PyObject *args, int nargs,
! 			 int i, int n, float *p_a);
! extern int PyArg_GetLongArraySize(PyObject *args, int nargs,
! 				 int i, long *p_a);
! extern int PyArg_GetShortArraySize(PyObject *args, int nargs,
! 				int i, short *p_a);
! extern int PyArg_GetDoubleArraySize(PyObject *args, int nargs,
! 				 int i, double *p_a);
! extern int PyArg_GetFloatArraySize(PyObject *args, int nargs,
! 				 int i, float *p_a);
 
 #ifdef __cplusplus
Index: cmathmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/cmathmodule.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** cmathmodule.c	2000年06月30日 02:29:22	2.13
--- cmathmodule.c	2000年07月09日 03:09:55	2.14
***************
*** 348,352 ****
 math_1(args, func)
 	PyObject *args;
! 	Py_complex (*func) Py_FPROTO((Py_complex));
 {
 	Py_complex x;
--- 348,352 ----
 math_1(args, func)
 	PyObject *args;
! 	Py_complex (*func)(Py_complex);
 {
 	Py_complex x;
Index: glmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/glmodule.c,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** glmodule.c	2000年06月30日 23:58:05	2.5
--- glmodule.c	2000年07月09日 03:09:55	2.6
***************
*** 108,112 ****
 	int i, n, width;
 	double vec[3];
! 	PyObject * (*getitem) Py_FPROTO((PyObject *, int));
 	
 	if (!PyArg_GetObject(args, 1, 0, &v))
--- 108,112 ----
 	int i, n, width;
 	double vec[3];
! 	PyObject * (*getitem)(PyObject *, int);
 	
 	if (!PyArg_GetObject(args, 1, 0, &v))
***************
*** 209,213 ****
 	int i, n;
 	float norm[3], vec[3];
! 	PyObject * (*getitem) Py_FPROTO((PyObject *, int));
 	
 	if (!PyArg_GetObject(args, 1, 0, &v))
--- 209,213 ----
 	int i, n;
 	float norm[3], vec[3];
! 	PyObject * (*getitem)(PyObject *, int);
 	
 	if (!PyArg_GetObject(args, 1, 0, &v))
Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -r2.27 -r2.28
*** mpzmodule.c	2000年06月30日 23:58:05	2.27
--- mpzmodule.c	2000年07月09日 03:09:55	2.28
***************
*** 1013,1018 ****
 	
 /* Forward */
! static void mpz_divm Py_PROTO((MP_INT *res, const MP_INT *num,
! 			 const MP_INT *den, const MP_INT *mod));
 
 static PyObject *
--- 1013,1018 ----
 	
 /* Forward */
! static void mpz_divm(MP_INT *res, const MP_INT *num,
! 	 const MP_INT *den, const MP_INT *mod);
 
 static PyObject *
Index: nismodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/nismodule.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** nismodule.c	2000年05月03日 23:44:32	2.16
--- nismodule.c	2000年07月09日 03:09:55	2.17
***************
*** 72,76 ****
 }
 
! typedef int (*foreachfunc) Py_PROTO((int, char *, int, char *, int, char *));
 
 struct ypcallback_data {
--- 72,76 ----
 }
 
! typedef int (*foreachfunc)(int, char *, int, char *, int, char *);
 
 struct ypcallback_data {
Index: readline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** readline.c	2000年07月06日 18:55:12	2.19
--- readline.c	2000年07月09日 03:09:55	2.20
***************
*** 40,44 ****
 /* Pointers needed from outside (but not declared in a header file). */
 extern int (*PyOS_InputHook)();
! extern char *(*PyOS_ReadlineFunctionPointer) Py_PROTO((char *));
 
 
--- 40,44 ----
 /* Pointers needed from outside (but not declared in a header file). */
 extern int (*PyOS_InputHook)();
! extern char *(*PyOS_ReadlineFunctionPointer)(char *);
 
 
Index: rgbimgmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/rgbimgmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** rgbimgmodule.c	1998年12月04日 18:50:03	2.18
--- rgbimgmodule.c	2000年07月09日 03:09:55	2.19
***************
*** 96,105 ****
 #define CHANOFFSET(z)	(3-(z))	/* this is byte order dependent */
 
! static void expandrow Py_PROTO((unsigned char *, unsigned char *, int));
! static void setalpha Py_PROTO((unsigned char *, int));
! static void copybw Py_PROTO((Py_Int32 *, int));
! static void interleaverow Py_PROTO((unsigned char*, unsigned char*, int, int));
! static int compressrow Py_PROTO((unsigned char *, unsigned char *, int, int));
! static void lumrow Py_PROTO((unsigned char *, unsigned char *, int));
 
 #ifdef ADD_TAGS
--- 96,105 ----
 #define CHANOFFSET(z)	(3-(z))	/* this is byte order dependent */
 
! static void expandrow(unsigned char *, unsigned char *, int);
! static void setalpha(unsigned char *, int);
! static void copybw(Py_Int32 *, int);
! static void interleaverow(unsigned char*, unsigned char*, int, int);
! static int compressrow(unsigned char *, unsigned char *, int, int);
! static void lumrow(unsigned char *, unsigned char *, int);
 
 #ifdef ADD_TAGS
Index: signalmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v
retrieving revision 2.44
retrieving revision 2.45
diff -C2 -r2.44 -r2.45
*** signalmodule.c	2000年07月04日 14:17:33	2.44
--- signalmodule.c	2000年07月09日 03:09:55	2.45
***************
*** 124,128 ****
 		Handlers[sig_num].tripped = 1;
 		Py_AddPendingCall(
! 			(int (*) Py_PROTO((ANY *)))PyErr_CheckSignals, NULL);
 #ifdef WITH_THREAD
 	}
--- 124,128 ----
 		Handlers[sig_num].tripped = 1;
 		Py_AddPendingCall(
! 			(int (*)(ANY *))PyErr_CheckSignals, NULL);
 #ifdef WITH_THREAD
 	}
***************
*** 639,643 ****
 	is_tripped++;
 	Handlers[SIGINT].tripped = 1;
! 	Py_AddPendingCall((int (*) Py_PROTO((ANY *)))PyErr_CheckSignals, NULL);
 }
 
--- 639,643 ----
 	is_tripped++;
 	Handlers[SIGINT].tripped = 1;
! 	Py_AddPendingCall((int (*)(ANY *))PyErr_CheckSignals, NULL);
 }
 
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** socketmodule.c	2000年07月07日 14:13:29	1.113
--- socketmodule.c	2000年07月09日 03:09:55	1.114
***************
*** 1113,1117 ****
 BUILD_FUNC_DEF_2(PySocketSock_makefile,PySocketSockObject *,s, PyObject *,args)
 {
! 	extern int fclose Py_PROTO((FILE *));
 	char *mode = "r";
 	int bufsize = -1;
--- 1113,1117 ----
 BUILD_FUNC_DEF_2(PySocketSock_makefile,PySocketSockObject *,s, PyObject *,args)
 {
! 	extern int fclose(FILE *);
 	char *mode = "r";
 	int bufsize = -1;
Index: stropmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.65
retrieving revision 2.66
diff -C2 -r2.65 -r2.66
*** stropmodule.c	2000年06月30日 23:58:05	2.65
--- stropmodule.c	2000年07月09日 03:09:55	2.66
***************
*** 879,883 ****
 	PyObject *args;
 {
! 	extern double strtod Py_PROTO((const char *, char **));
 	char *s, *end;
 	double x;
--- 879,883 ----
 	PyObject *args;
 {
! 	extern double strtod(const char *, char **);
 	char *s, *end;
 	double x;
Index: structmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** structmodule.c	2000年06月30日 23:58:05	2.33
--- structmodule.c	2000年07月09日 03:09:56	2.34
***************
*** 407,415 ****
 	int size;
 	int alignment;
! 	PyObject* (*unpack) Py_PROTO((const char *,
! 				 const struct _formatdef *));
! 	int (*pack) Py_PROTO((char *,
! 			 PyObject *,
! 			 const struct _formatdef *));
 } formatdef;
 
--- 407,414 ----
 	int size;
 	int alignment;
! 	PyObject* (*unpack)(const char *,
! 			 const struct _formatdef *);
! 	int (*pack)(char *, PyObject *,
! 		 const struct _formatdef *);
 } formatdef;
 
Index: svmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/svmodule.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** svmodule.c	2000年06月30日 23:58:05	2.13
--- svmodule.c	2000年07月09日 03:09:56	2.14
***************
*** 38,42 ****
 static PyObject *SvError;		/* exception sv.error */
 
! static PyObject *newcaptureobject Py_PROTO((svobject *, void *, int));
 
 /* Set a SV-specific error from svideo_errno and return NULL */
--- 38,42 ----
 static PyObject *SvError;		/* exception sv.error */
 
! static PyObject *newcaptureobject(svobject *, void *, int);
 
 /* Set a SV-specific error from svideo_errno and return NULL */
Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.89
retrieving revision 2.90
diff -C2 -r2.89 -r2.90
*** timemodule.c	2000年07月03日 21:37:27	2.89
--- timemodule.c	2000年07月09日 03:09:56	2.90
***************
*** 91,96 ****
 
 /* Forward declarations */
! static int floatsleep Py_PROTO((double));
! static double floattime Py_PROTO(());
 
 /* For Y2K check */
--- 91,96 ----
 
 /* Forward declarations */
! static int floatsleep(double);
! static double floattime();
 
 /* For Y2K check */
***************
*** 256,260 ****
 time_convert(when, function)
 	time_t when;
! 	struct tm * (*function) Py_PROTO((const time_t *));
 {
 	struct tm *p;
--- 256,260 ----
 time_convert(when, function)
 	time_t when;
! 	struct tm * (*function)(const time_t *);
 {
 	struct tm *p;
***************
*** 787,792 ****
 	struct timeb t1, t2;
 	double frac;
! 	extern double fmod Py_PROTO((double, double));
! 	extern double floor Py_PROTO((double));
 	if (secs <= 0.0)
 		return;
--- 787,792 ----
 	struct timeb t1, t2;
 	double frac;
! 	extern double fmod(double, double);
! 	extern double floor(double);
 	if (secs <= 0.0)
 		return;

---

• Previous message: [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
• Next message: [Python-checkins] CVS: python/dist/src/Tools/freeze makefreeze.py,1.10,1.11
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]