aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-09-30 13:17:36 -0700
committerPaul Eggert2014-09-30 13:17:36 -0700
commit6aed001ad31d41f028d77e66e597b7b3ab4e31ae (patch)
treedd1c01fd19ae20c00688e27e6ee181c771c0de59 /src
parent4dfc68b1db75006f7b5642fea6875e74197400d4 (diff)
downloademacs-6aed001ad31d41f028d77e66e597b7b3ab4e31ae.tar.gz
emacs-6aed001ad31d41f028d77e66e597b7b3ab4e31ae.zip
* alloc.c: Remove now-unnecessary check.
Suggested by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00891.html
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 47c43f66915..7dfa2f80775 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12014-09-30 Paul Eggert <eggert@cs.ucla.edu> 12014-09-30 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * alloc.c: Remove now-unnecessary check.
4 Suggested by Dmitry Antipov in:
5 http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00891.html
6
3 * xterm.c (x_term_init): Allocate temps on stack, not on heap. 7 * xterm.c (x_term_init): Allocate temps on stack, not on heap.
4 8
5 * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings 9 * frame.c (x_set_frame_parameters): Port --enable-gcc-warnings
diff --git a/src/alloc.c b/src/alloc.c
index 93bdd9a2810..f656dc94216 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -69,12 +69,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
69static bool valgrind_p; 69static bool valgrind_p;
70#endif 70#endif
71 71
72#if USE_STACK_LISP_OBJECTS
73# if GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS
74# error "Stack-allocated Lisp objects are not compatible with GCPROs"
75# endif
76#endif
77
78/* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects. 72/* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects.
79 Doable only if GC_MARK_STACK. */ 73 Doable only if GC_MARK_STACK. */
80#if ! GC_MARK_STACK 74#if ! GC_MARK_STACK