diff options
| author | Richard Brooksby | 2012-09-06 17:17:18 +0100 |
|---|---|---|
| committer | Richard Brooksby | 2012-09-06 17:17:18 +0100 |
| commit | 858e4ac0ac8ee684f48f0edd9d80ae28b17aee53 (patch) | |
| tree | 5034519c869b370df2c87394c03f7f30e78945b9 /mps/code/pool.c | |
| parent | 383335816d888b5f28fe7b034106dc2056f56620 (diff) | |
| download | emacs-858e4ac0ac8ee684f48f0edd9d80ae28b17aee53.tar.gz emacs-858e4ac0ac8ee684f48f0edd9d80ae28b17aee53.zip | |
Partial merge of branch/2012-07-23/cet-transform, excluding cet-specific parts.
Copied from Perforce
Change: 179309
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/pool.c')
| -rw-r--r-- | mps/code/pool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mps/code/pool.c b/mps/code/pool.c index 0635bf012b3..a88cf48e97c 100644 --- a/mps/code/pool.c +++ b/mps/code/pool.c | |||
| @@ -425,7 +425,7 @@ Res (PoolFix)(Pool pool, ScanState ss, Seg seg, Addr *refIO) | |||
| 425 | return PoolFix(pool, ss, seg, refIO); | 425 | return PoolFix(pool, ss, seg, refIO); |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | void PoolFixEmergency(Pool pool, ScanState ss, Seg seg, Addr *refIO) | 428 | Res PoolFixEmergency(Pool pool, ScanState ss, Seg seg, Addr *refIO) |
| 429 | { | 429 | { |
| 430 | Res res; | 430 | Res res; |
| 431 | 431 | ||
| @@ -440,6 +440,7 @@ void PoolFixEmergency(Pool pool, ScanState ss, Seg seg, Addr *refIO) | |||
| 440 | 440 | ||
| 441 | res = (pool->class->fixEmergency)(pool, ss, seg, refIO); | 441 | res = (pool->class->fixEmergency)(pool, ss, seg, refIO); |
| 442 | AVER(res == ResOK); | 442 | AVER(res == ResOK); |
| 443 | return res; | ||
| 443 | } | 444 | } |
| 444 | 445 | ||
| 445 | 446 | ||