From: Jim Kingdon <jkingdon@engr.sgi.com>
Date: Sun, 16 Jan 1994 18:48:02 +0000 (+0000)
Subject: 	* chardefs.h: Don't declare xmalloc.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5bac80223246f762f09075ffc5d614ca34808ea0;p=binutils-gdb.git

	* chardefs.h: Don't declare xmalloc.

	* keymaps.h: Include "chardefs.h" not <readline/chardefs.h>.
---

diff --git a/readline/ChangeLog b/readline/ChangeLog
index a5e83f4bd5a..365bde8fef1 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 43d8539c79c..241567ea3fd 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