Merge some alloca.c changes from Emacs.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index b283294d06e64a3576f98f0c2cbf572013563bdb..076c4ed1ffaa202e115ec5fc4eb651029438e893 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,15 @@
+2002-12-05  Paul Eggert  <eggert@twinsun.com>
+
+       * alloca.c [defined emacs]: Include "lisp.h".
+       (xalloc_die) [defined emacs]: New macro.
+       (free) [defined emacs && defined EMACS_FREE]: Define to EMACS_FREE.
+       [! defined emacs]: Include <xalloc.h>.
+       (POINTER_TYPE) [!defined POINTER_TYPE]: New macro.
+       (pointer): Typedef to POINTER_TYPE *.
+       (malloc): Remove decl; we now always use xmalloc.
+       (alloca): Use old-style definition, since Emacs needs this.
+       Check for arithmetic overflow when computing combined size.
+       
 2002-12-04  Paul Eggert  <eggert@twinsun.com>
 
        Do not generate unlocked-io.h automatically, since it's easier to