aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1994-01-16 18:48:02 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1994-01-16 18:48:02 +0000
commit5bac80223246f762f09075ffc5d614ca34808ea0 (patch)
tree329ce576d4bfb285dfeda170a77e077aa61dd4e5
parent8f85a4357a6c06d09e2308f9307b71c20b0766bb (diff)
downloadgdb-5bac80223246f762f09075ffc5d614ca34808ea0.zip
gdb-5bac80223246f762f09075ffc5d614ca34808ea0.tar.gz
gdb-5bac80223246f762f09075ffc5d614ca34808ea0.tar.bz2
* chardefs.h: Don't declare xmalloc.
* keymaps.h: Include "chardefs.h" not <readline/chardefs.h>.
-rw-r--r--readline/ChangeLog4
-rw-r--r--readline/chardefs.h11
2 files changed, 15 insertions, 0 deletions
diff --git a/readline/ChangeLog b/readline/ChangeLog
index a5e83f4..365bde8 100644
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,5 +1,9 @@
Sun Jan 16 12:33:11 1994 Jim Kingdon (kingdon@lioth.cygnus.com)
+ * chardefs.h: Don't declare xmalloc.
+
+ * keymaps.h: Include "chardefs.h" not <readline/chardefs.h>.
+
* Makefile.in (clean mostlyclean distclean realclean): Recurse
into subdirectories as well as doing this directory. Add clean-dvi
target.
diff --git a/readline/chardefs.h b/readline/chardefs.h
index 43d8539..241567e 100644
--- a/readline/chardefs.h
+++ b/readline/chardefs.h
@@ -11,7 +11,18 @@
#endif /* HAVE_STRING_H */
#ifndef savestring
+#if 0
+
+/* CYGNUS LOCAL--this declaration loses if xmalloc has already been
+ declared as void *xmalloc (), as in GDB. The whole concept of
+ readline using xmalloc rather than just returning NULL when it runs
+ out of memory is questionable, but if we do want xmalloc we need a
+ better way to declare it (e.g. the client declares it, or the client
+ calls a rl_register_xmalloc function analagous to the way signal()
+ works. */
+
extern char *xmalloc ();
+#endif
# ifndef strcpy
extern char *strcpy ();
# endif