diff options
| author | Richard Brooksby | 2001-12-05 15:48:24 +0000 |
|---|---|---|
| committer | Richard Brooksby | 2001-12-05 15:48:24 +0000 |
| commit | 492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch) | |
| tree | 59a2df0f685b93b44fbc03847b76782275308aaf /mps/code/shield.c | |
| parent | 25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff) | |
| download | emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.tar.gz emacs-492dd3c684e53bd42b28371bdaaa99ad67ebd835.zip | |
Merging changes from union to masters. this incorporates pekka's updates: tuning and a type in amcsshe.c and some adding some missing checks in arenavm.c. it also brings our cope of their hopenames up to date.
Copied from Perforce
Change: 24815
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code/shield.c')
| -rw-r--r-- | mps/code/shield.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mps/code/shield.c b/mps/code/shield.c index c472e48d71e..15fe91b6626 100644 --- a/mps/code/shield.c +++ b/mps/code/shield.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* impl.c.shield: SHIELD IMPLEMENTATION | 1 | /* impl.c.shield: SHIELD IMPLEMENTATION |
| 2 | * | 2 | * |
| 3 | * $HopeName: MMsrc!shield.c(trunk.15) $ | 3 | * $HopeName: MMsrc!shield.c(trunk.16) $ |
| 4 | * Copyright (C) 1997 Harlequin Limited. All rights reserved. | 4 | * Copyright (C) 1997 Harlequin Limited. All rights reserved. |
| 5 | * | 5 | * |
| 6 | * See: idea.shield, design.mps.shield. | 6 | * See: idea.shield, design.mps.shield. |
| @@ -74,7 +74,7 @@ | |||
| 74 | 74 | ||
| 75 | #include "mpm.h" | 75 | #include "mpm.h" |
| 76 | 76 | ||
| 77 | SRCID(shield, "$HopeName: MMsrc!shield.c(trunk.15) $"); | 77 | SRCID(shield, "$HopeName: MMsrc!shield.c(trunk.16) $"); |
| 78 | 78 | ||
| 79 | 79 | ||
| 80 | void (ShieldSuspend)(Arena arena) | 80 | void (ShieldSuspend)(Arena arena) |