# HG changeset patch # User Stefan Monnier # Date 1216931208 0 # Node ID 359d8fb735387b9b53e5c3174a192c1dfaf191cc # Parent 5051febae49ba241b70ac5505892e7a7b1510c29 (PURESIZE_CHECKING_RATIO): New macro. (PURESIZE): Use it. diff -r 5051febae49b -r 359d8fb73538 src/ChangeLog --- 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 + + * puresize.h (PURESIZE_CHECKING_RATIO): New macro. + (PURESIZE): Use it. + 2008-07-24 Dan Nicolaescu * m/amdx86-64.h (HAVE_LIB64_DIR): Consolidate ifdefs. @@ -33,11 +38,11 @@ 2008-07-23 Jason Rumney - * 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 @@ -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 @@ -227,8 +231,7 @@ 2008-07-20 Adrian Robert - * 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 diff -r 5051febae49b -r 359d8fb73538 src/puresize.h --- 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. */