Mercurial > emacs
comparison src/alloc.c @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | 7df2e30d72ec ef719132ddfa |
| children | 42e22c4f06b7 |
comparison
equal
deleted
inserted
replaced
| 112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
|---|---|
| 6313 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES | 6313 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES |
| 6314 defsubr (&Sgc_status); | 6314 defsubr (&Sgc_status); |
| 6315 #endif | 6315 #endif |
| 6316 } | 6316 } |
| 6317 | 6317 |
| 6318 /* arch-tag: 6695ca10-e3c5-4c2c-8bc3-ed26a7dda857 | |
| 6319 (do not change this comment) */ |