summaryrefslogtreecommitdiffstats
path: root/gnu/lib
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1995-03-17 21:11:53 +0000
committerache <ache@FreeBSD.org>1995-03-17 21:11:53 +0000
commit51b264e4f12cb0fffa6e930f62ad3b37fe68c9ed (patch)
tree4bf25c20dc2ca75a90145194fdea39e202c5cda2 /gnu/lib
parentd03edd038c7bf2211e6f2fcc2cef625c3c66d3c9 (diff)
downloadFreeBSD-src-51b264e4f12cb0fffa6e930f62ad3b37fe68c9ed.zip
FreeBSD-src-51b264e4f12cb0fffa6e930f62ad3b37fe68c9ed.tar.gz
Fix savestring & gdb conflict
Moreover, this fix not breaks any pgm which uses readline's savestring
Diffstat (limited to 'gnu/lib')
-rw-r--r--gnu/lib/libreadline/readline.c5
-rw-r--r--gnu/lib/libreadline/readline.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/gnu/lib/libreadline/readline.c b/gnu/lib/libreadline/readline.c
index fe39163..1a27bd4 100644
--- a/gnu/lib/libreadline/readline.c
+++ b/gnu/lib/libreadline/readline.c
@@ -3362,13 +3362,10 @@ rl_getc (stream)
}
#if !defined (SHELL)
-#ifdef savestring
-#undef savestring
-#endif
/* Backwards compatibilty, now that savestring has been removed from
all `public' readline header files. */
char *
-savestring (s)
+rl_savestring (s)
char *s;
{
return ((char *)strcpy (xmalloc (1 + (int)strlen (s)), (s)));
diff --git a/gnu/lib/libreadline/readline.h b/gnu/lib/libreadline/readline.h
index b397177..652d8ca 100644
--- a/gnu/lib/libreadline/readline.h
+++ b/gnu/lib/libreadline/readline.h
@@ -283,7 +283,8 @@ extern int rl_forced_update_display ();
#define RL_PROMPT_END_IGNORE '\002'
#if !defined (savestring)
-extern char *savestring (); /* XXX backwards compatibility */
+#define savestring rl_savestring /* XXX backwards compatibility */
#endif
+extern char *rl_savestring ();
#endif /* _READLINE_H_ */
OpenPOWER on IntegriCloud