Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
14145a1e
Commit
14145a1e
authored
Oct 18, 2012
by
Daniel Colascione
Browse files
Increase NSTATICS; tell the user when we run out of static slots.
parent
393e94fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/ChangeLog
src/ChangeLog
+6
-0
src/alloc.c
src/alloc.c
+2
-2
No files found.
src/ChangeLog
View file @
14145a1e
2012-10-18 Daniel Colascione <dancol@dancol.org>
* alloc.c (NSTATICS): Increase from 0x650 to 0x1000
(staticpro): If we run out of staticpro slots, die with an
informative error instead of just calling emacs_abort.
2012-10-18 Martin Rudalics <rudalics@gmx.at>
Fix two flaws reported by Dmitry Antipov.
...
...
src/alloc.c
View file @
14145a1e
...
...
@@ -376,7 +376,7 @@ struct gcpro *gcprolist;
/* Addresses of staticpro'd variables. Initialize it to a nonzero
value; otherwise some compilers put it into BSS. */
#define NSTATICS 0x
65
0
#define NSTATICS 0x
100
0
static
Lisp_Object
*
staticvec
[
NSTATICS
]
=
{
&
Vpurify_flag
};
/* Index of next unused slot in staticvec. */
...
...
@@ -5030,7 +5030,7 @@ staticpro (Lisp_Object *varaddress)
{
staticvec
[
staticidx
++
]
=
varaddress
;
if
(
staticidx
>=
NSTATICS
)
emacs_abort (
);
fatal
(
"NSTATICS too small. Try increasing and recompiling Emacs."
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment