diff src/ChangeLog @ 3170:db0631f96757

[xemacs-hg @ 2005-12-24 19:06:04 by aidan] Allow the low-memory warning code to call malloc itself.
author aidan
date Sat, 24 Dec 2005 19:06:05 +0000
parents 5bfedec8927e
children 4cad7ff4a200
line wrap: on
line diff
--- a/src/ChangeLog	Sat Dec 24 17:33:34 2005 +0000
+++ b/src/ChangeLog	Sat Dec 24 19:06:05 2005 +0000
@@ -1,3 +1,15 @@
+2005-12-24  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* alloc.c (MALLOC_BEGIN):
+	Assert that we're either not in malloc, or warning about memory
+	being low. 
+	* alloc.c (MALLOC_WARNING_BEGIN, MALLOC_WARNING_END):
+	Add two clauses to set and clear a flag that we're in a low-memory
+	warning situation. 
+	* alloc.c (malloc_warning): 
+	Move it after the definition of MALLOC_WARNING_BEGIN,
+	MALLOC_WARNING_END
+
 2005-12-24  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* objects-gtk.c (MAX_FONT_COUNT):