diff options
| author | Eli Zaretskii | 2012-10-18 20:19:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-18 20:19:55 +0200 |
| commit | 81f8ee3ff0b25c479c6a8095d32d762610009e29 (patch) | |
| tree | f5e9719730673fad05308d6d18923eb8afe5e73a /src/alloc.c | |
| parent | 9e1821d3a2350a87de85d19208a63cfcd27d7b50 (diff) | |
| parent | 14145a1e84e9c84af22d66ed272bf1b28f597e24 (diff) | |
| download | emacs-81f8ee3ff0b25c479c6a8095d32d762610009e29.tar.gz emacs-81f8ee3ff0b25c479c6a8095d32d762610009e29.zip | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index f2dd7c8cee7..08dc26784cc 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -376,7 +376,7 @@ struct gcpro *gcprolist; | |||
| 376 | /* Addresses of staticpro'd variables. Initialize it to a nonzero | 376 | /* Addresses of staticpro'd variables. Initialize it to a nonzero |
| 377 | value; otherwise some compilers put it into BSS. */ | 377 | value; otherwise some compilers put it into BSS. */ |
| 378 | 378 | ||
| 379 | #define NSTATICS 0x660 | 379 | #define NSTATICS 0x1000 |
| 380 | static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; | 380 | static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag}; |
| 381 | 381 | ||
| 382 | /* Index of next unused slot in staticvec. */ | 382 | /* Index of next unused slot in staticvec. */ |
| @@ -5030,7 +5030,7 @@ staticpro (Lisp_Object *varaddress) | |||
| 5030 | { | 5030 | { |
| 5031 | staticvec[staticidx++] = varaddress; | 5031 | staticvec[staticidx++] = varaddress; |
| 5032 | if (staticidx >= NSTATICS) | 5032 | if (staticidx >= NSTATICS) |
| 5033 | emacs_abort (); | 5033 | fatal ("NSTATICS too small. Try increasing and recompiling Emacs."); |
| 5034 | } | 5034 | } |
| 5035 | 5035 | ||
| 5036 | 5036 | ||