53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 93f772832b96e0c48223c452324e9736d7de051e Mon Sep 17 00:00:00 2001
|
|
From: Chris Packham <judge.packham@gmail.com>
|
|
Date: Wed, 30 Apr 2025 16:49:44 +1200
|
|
Subject: [PATCH] readline/tcap.h: Update definitions for C23
|
|
|
|
C23 changes how function definitions like int `int tputs ()` are
|
|
interpreted. In older standards this meant that the function arguments
|
|
are unknown. In C23 this is interpreted as `int tputs (void)` so now
|
|
when we compile with GCC15 (which defaults to -std=gnu23) we get an
|
|
error such as
|
|
|
|
readline/display.c:2839:17: error: too many arguments to function 'tputs'; expected 0, have 3
|
|
|
|
Add the function arguments for tgetent(), tgetflag(), tgetnum(),
|
|
tgetstr(), tputs() and tgoto().
|
|
|
|
Signed-off-by: Chris Packham <judge.packham@gmail.com>
|
|
Approved-By: Tom Tromey <tom@tromey.com>
|
|
Upstream: 5c87b330e910f8be1443c881fd16a70e685f1f2f
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
readline/readline/tcap.h | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/readline/readline/tcap.h b/readline/readline/tcap.h
|
|
index 859e6eed5aa..9e2ed124e49 100644
|
|
--- a/readline/readline/tcap.h
|
|
+++ b/readline/readline/tcap.h
|
|
@@ -46,14 +46,14 @@ extern char *UP, *BC;
|
|
|
|
extern short ospeed;
|
|
|
|
-extern int tgetent ();
|
|
-extern int tgetflag ();
|
|
-extern int tgetnum ();
|
|
-extern char *tgetstr ();
|
|
+extern int tgetent (char *bp, const char *name);
|
|
+extern int tgetflag (char *id);
|
|
+extern int tgetnum (char *id);
|
|
+extern char *tgetstr (char *id, char **area);
|
|
|
|
-extern int tputs ();
|
|
+extern int tputs (const char *str, int affcnt, int (*putc)(int));
|
|
|
|
-extern char *tgoto ();
|
|
+extern char *tgoto (const char *cap, int col, int row);
|
|
|
|
#endif /* HAVE_TERMCAP_H */
|
|
|
|
--
|
|
2.49.0
|
|
|