# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1039121197 0
# Node ID 335a257b54d77cf90593b7a06f4a645b5436bb9d
# Parent  d995caef4acc9aa2aaa789b404f51e3a942cac06
Merge some alloca.c changes from Emacs.

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- 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