changeset 96987:359d8fb73538

(PURESIZE_CHECKING_RATIO): New macro. (PURESIZE): Use it.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 24 Jul 2008 20:26:48 +0000
parents 5051febae49b
children 77625aa3eac4
files src/ChangeLog src/puresize.h
diffstat 2 files changed, 22 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jul 24 18:46:01 2008 +0000
+++ b/src/ChangeLog	Thu Jul 24 20:26:48 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* puresize.h (PURESIZE_CHECKING_RATIO): New macro.
+	(PURESIZE): Use it.
+
 2008-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* m/amdx86-64.h (HAVE_LIB64_DIR): Consolidate ifdefs.
@@ -33,11 +38,11 @@
 
 2008-07-23  Jason Rumney  <jasonr@gnu.org>
 
-        * w32font.c (w32_enumfont_pattern_entity): Return height consistent
-        with opened font.
-        (w32font_open): Set font type to gdi.
-
-        * w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
+	* w32font.c (w32_enumfont_pattern_entity): Return height consistent
+	with opened font.
+	(w32font_open): Set font type to gdi.
+
+	* w32uniscribe.c (uniscribe_open): Set font type to uniscribe.
 
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -216,8 +221,7 @@
 
 	* syntax.c (find_start_pos, find_start_value)
 	(find_start_value_byte, find_start_begv, find_defun_start)
-	(back_comment, scan_sexps_forward): Use EMACS_INT for buffer
-	positions.
+	(back_comment, scan_sexps_forward): Use EMACS_INT for buffer positions.
 
 2008-07-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -227,8 +231,7 @@
 
 2008-07-20  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
-	* nsterm.m (ns_get_color): Recognize HSB,AHSB be synonyms for
-	HSV,AHSV.
+	* nsterm.m (ns_get_color): Recognize HSB,AHSB be synonyms for HSV,AHSV.
 
 2008-07-20  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
--- a/src/puresize.h	Thu Jul 24 18:46:01 2008 +0000
+++ b/src/puresize.h	Thu Jul 24 20:26:48 2008 +0000
@@ -53,9 +53,18 @@
 #endif
 #endif
 
+#ifdef ENABLE_CHECKING
+/* ENABLE_CHECKING somehow increases the purespace used, probably because
+   it tends to cause some macro arguments to be evaluated twice.  This is
+   a bug, but it's difficult to track it down.  */
+#define PURESIZE_CHECKING_RATIO 12/10	/* Don't surround with `()'. */
+#else
+#define PURESIZE_CHECKING_RATIO 1
+#endif
+
 /* This is the actual size in bytes to allocate.  */
 #ifndef PURESIZE
-#define PURESIZE  (BASE_PURESIZE * PURESIZE_RATIO)
+#define PURESIZE  (BASE_PURESIZE * PURESIZE_RATIO * PURESIZE_CHECKING_RATIO)
 #endif
 
 /* Signal an error if OBJ is pure.  */