aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-11-06 21:37:49 -0800
committerPaul Eggert2011-11-06 21:37:49 -0800
commitca78dc431fff3bc2a4f33f2a0fc1449608568d23 (patch)
tree852659f64eee8bd5aa0e53736d8dcfdde793d8ed
parent3c6702ef8a797bff39c6e1e4440efab84ca3b8cf (diff)
downloademacs-ca78dc431fff3bc2a4f33f2a0fc1449608568d23.tar.gz
emacs-ca78dc431fff3bc2a4f33f2a0fc1449608568d23.zip
* alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926).
This is also needed for porting to any host where GC_MARK_STACK is not GC_MAKE_GCPROS_NOOPS. (which_symbols): Use it.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/alloc.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4058054ec02..3711292ad35 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12011-11-07 Paul Eggert <eggert@cs.ucla.edu>
2
3 * alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926).
4 This is also needed for porting to any host where GC_MARK_STACK is
5 not GC_MAKE_GCPROS_NOOPS.
6 (which_symbols): Use it.
7
12011-11-07 Kenichi Handa <handa@m17n.org> 82011-11-07 Kenichi Handa <handa@m17n.org>
2 9
3 * coding.c (coding_set_destination): Check coding->src_pos only 10 * coding.c (coding_set_destination): Check coding->src_pos only
diff --git a/src/alloc.c b/src/alloc.c
index 210dd7d1687..985e4b71426 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -315,6 +315,7 @@ static POINTER_TYPE *lisp_malloc (size_t, enum mem_type);
315 on free lists recognizable in O(1). */ 315 on free lists recognizable in O(1). */
316 316
317static Lisp_Object Vdead; 317static Lisp_Object Vdead;
318#define DEADP(x) EQ (x, Vdead)
318 319
319#ifdef GC_MALLOC_CHECK 320#ifdef GC_MALLOC_CHECK
320 321
@@ -411,6 +412,10 @@ static void check_gcpros (void);
411 412
412#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ 413#endif /* GC_MARK_STACK || GC_MALLOC_CHECK */
413 414
415#ifndef DEADP
416# define DEADP(x) 0
417#endif
418
414/* Recording what needs to be marked for gc. */ 419/* Recording what needs to be marked for gc. */
415 420
416struct gcpro *gcprolist; 421struct gcpro *gcprolist;
@@ -6261,7 +6266,7 @@ which_symbols (Lisp_Object obj, EMACS_INT find_max)
6261 int gc_count = inhibit_garbage_collection (); 6266 int gc_count = inhibit_garbage_collection ();
6262 Lisp_Object found = Qnil; 6267 Lisp_Object found = Qnil;
6263 6268
6264 if (!EQ (obj, Vdead)) 6269 if (! DEADP (obj))
6265 { 6270 {
6266 for (sblk = symbol_block; sblk; sblk = sblk->next) 6271 for (sblk = symbol_block; sblk; sblk = sblk->next)
6267 { 6272 {