summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wouters <thomas@python.org>2000-07-22 23:51:19 (GMT)
committerThomas Wouters <thomas@python.org>2000-07-22 23:51:19 (GMT)
commit2c46eaf8e948607f7551f2075044d27d27c43775 (patch)
tree416af9b6cb10c98279a423906a8f4da282d753d6
parent0796b0027965b1ea4f7b1775ad2e883d66f07d89 (diff)
downloadcpython-2c46eaf8e948607f7551f2075044d27d27c43775.zip
cpython-2c46eaf8e948607f7551f2075044d27d27c43775.tar.gz
cpython-2c46eaf8e948607f7551f2075044d27d27c43775.tar.bz2
ANSIfication of function-pointers and declarations. Also, make sure to
return something if RETSIGTYPE is not void, in functions that are defined as returning RETSIGTYPE.
-rw-r--r--Modules/readline.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index a0a88eb..47644c4 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -38,7 +38,7 @@ extern Function *rl_event_hook;
#endif
/* Pointers needed from outside (but not declared in a header file). */
-extern int (*PyOS_InputHook)();
+extern int (*PyOS_InputHook)(void);
extern char *(*PyOS_ReadlineFunctionPointer)(char *);
@@ -431,6 +431,9 @@ static RETSIGTYPE
onintr(int sig)
{
longjmp(jbuf, 1);
+#if RETSIGTYPE != void
+ return 0;
+#endif
}
@@ -441,7 +444,7 @@ call_readline(char *prompt)
{
size_t n;
char *p, *q;
- RETSIGTYPE (*old_inthandler)();
+ RETSIGTYPE (*old_inthandler)(int);
old_inthandler = signal(SIGINT, onintr);
if (setjmp(jbuf)) {
#ifdef HAVE_SIGRELSE