diff options
| author | Eli Zaretskii | 2012-06-22 09:51:06 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-06-22 09:51:06 +0300 |
| commit | d251c37c729a3c96ad10c5f6675370d371159534 (patch) | |
| tree | 5ab51bc5b32d229aa412c751f3e19f73e7811ba1 /src | |
| parent | 89b5595ade3781299f7836c7b7d617314eaf907e (diff) | |
| download | emacs-d251c37c729a3c96ad10c5f6675370d371159534.tar.gz emacs-d251c37c729a3c96ad10c5f6675370d371159534.zip | |
Enlarge NSTATICS to 0x650.
src/alloc.c (NSTATICS): Enlarge to 0x650. Otherwise, Emacs compiled
with -DENABLE_CHECKING -DXASSERTS -DGLYPH_DEBUG=1 -DBYTE_CODE_METER
aborts in staticpro during startup. (Without -DBYTE_CODE_METER,
staticidx goes up to 1597 out of 1600 = 0x640.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 69f11e5a614..128b05e0e7a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-06-22 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * alloc.c (NSTATICS): Enlarge to 0x650. Otherwise, Emacs compiled | ||
| 4 | with -DENABLE_CHECKING -DXASSERTS -DGLYPH_DEBUG=1 -DBYTE_CODE_METER | ||
| 5 | aborts in staticpro during startup. (Without -DBYTE_CODE_METER, | ||
| 6 | staticidx goes up to 1597 out of 1600 = 0x640.) | ||
| 7 | |||
| 1 | 2012-06-20 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2012-06-20 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 9 | ||
| 3 | * fileio.c (Fdefault_file_modes): Block input while fiddling with umask. | 10 | * fileio.c (Fdefault_file_modes): Block input while fiddling with umask. |
diff --git a/src/alloc.c b/src/alloc.c index 7af3b17078e..aba76386dd6 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -431,7 +431,7 @@ struct gcpro *gcprolist; | |||
| 431 | /* Addresses of staticpro'd variables. Initialize it to a nonzero | 431 | /* Addresses of staticpro'd variables. Initialize it to a nonzero |
| 432 | value; otherwise some compilers put it into BSS. */ | 432 | value; otherwise some compilers put it into BSS. */ |
| 433 | 433 | ||
| 434 | #define NSTATICS 0x640 | 434 | #define NSTATICS 0x650 |
| 435 | static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; | 435 | static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; |
| 436 | 436 | ||
| 437 | /* Index of next unused slot in staticvec. */ | 437 | /* Index of next unused slot in staticvec. */ |