From: Fred Drake <fdrake@acm.org>
Date: Thu, 31 Aug 2000 05:18:54 +0000 (+0000)
Subject: Peter Schneider-Kamp <nowonder@nowonder.de>:
X-Git-Tag: v2.0b1~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ce159aef570c7c85a1e3c938fbb91ed4d0a6979;p=python

Peter Schneider-Kamp <nowonder@nowonder.de>:
Remove some of GCC's warning in -Wstrict-prototypes mode.

This closes SourceForge patch #101342.
---

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 6648c9c0b3..530b214c1a 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -788,9 +788,7 @@ static char pop_doc [] =
 Return the i-th element and delete it from the array. i defaults to -1.";
 
 static PyObject *
-array_extend(self, args)
-	arrayobject *self;
-	PyObject *args;
+array_extend(arrayobject *self, PyObject *args)
 {
 	int size;
         PyObject    *bb;
diff --git a/Modules/readline.c b/Modules/readline.c
index 4f8969ba61..01482062f2 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -27,13 +27,13 @@
 #else
 #include <readline/readline.h> /* You may need to add an -I option to Setup */
 
-extern int rl_parse_and_bind();
-extern int rl_read_init_file();
-extern int rl_insert_text();
-extern int rl_bind_key();
-extern int rl_bind_key_in_map();
-extern int rl_initialize();
-extern int add_history();
+extern int rl_parse_and_bind(char *);
+extern int rl_read_init_file(char *);
+extern int rl_insert_text(char *);
+extern int rl_bind_key(int, Function *);
+extern int rl_bind_key_in_map(int, Function *, Keymap);
+extern int rl_initialize(void);
+extern int add_history(char *);
 extern Function *rl_event_hook;
 #endif
 
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 1c747a5e02..1c1f3d8cdb 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -508,7 +508,7 @@ static PyMethodDef poll_methods[] = {
 };
 
 static pollObject *
-newPollObject()
+newPollObject(void)
 {
         pollObject *self;
 	self = PyObject_New(pollObject, &poll_Type);
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index beb36b5a08..6305520d14 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -253,14 +253,11 @@ file_close(PyFileObject *f, PyObject *args)
 /* a portable fseek() function
    return 0 on success, non-zero on failure (with errno set) */
 int
-_portable_fseek(fp, offset, whence)
-	FILE* fp;
 #if defined(HAVE_LARGEFILE_SUPPORT) && SIZEOF_OFF_T < 8 && SIZEOF_FPOS_T >= 8 
-	fpos_t offset;
+_portable_fseek(FILE *fp, fpos_t offset, int whence)
 #else
-	off_t offset;
+_portable_fseek(FILE *fp, off_t offset, int whence)
 #endif
-	int whence;
 {
 #if defined(HAVE_FSEEKO)
 	return fseeko(fp, offset, whence);
@@ -302,8 +299,7 @@ fpos_t
 #else
 off_t
 #endif
-_portable_ftell(fp)
-	FILE* fp;
+_portable_ftell(FILE* fp)
 {
 #if defined(HAVE_FTELLO) && defined(HAVE_LARGEFILE_SUPPORT)
 	return ftello(fp);