# HG changeset patch # User Richard M. Stallman # Date 799801453 0 # Node ID 53ccd2d608eed31cc42851243e35e81c7f6436d5 # Parent 77a296d0ab90f049fe0ca77ae4cdbffb5121ecec (gc_cons_threshold): Change back to int. (min): New macro. (inhibit_garbage_collection): Don't exceed value an int can hold. diff -r 77a296d0ab90 -r 53ccd2d608ee src/alloc.c --- a/src/alloc.c Sat May 06 23:03:00 1995 +0000 +++ b/src/alloc.c Sat May 06 23:04:13 1995 +0000 @@ -45,6 +45,7 @@ extern int __malloc_extra_blocks; #define max(A,B) ((A) > (B) ? (A) : (B)) +#define min(A,B) ((A) < (B) ? (A) : (B)) /* Macro to verify that storage intended for Lisp objects is not out of range to fit in the space for a pointer. @@ -69,7 +70,7 @@ int consing_since_gc; /* Number of bytes of consing since gc before another gc should be done. */ -EMACS_INT gc_cons_threshold; +int gc_cons_threshold; /* Nonzero during gc */ int gc_in_progress; @@ -1321,8 +1322,9 @@ { int count = specpdl_ptr - specpdl; Lisp_Object number; + int nbits = min (VALBITS, INTBITS); - XSETINT (number, ((EMACS_INT) 1 << (VALBITS - 1)) - 1); + XSETINT (number, ((EMACS_INT) 1 << (nbits - 1)) - 1); specbind (Qgc_cons_threshold, number);