aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code/protocol.c
diff options
context:
space:
mode:
authorRichard Brooksby2001-12-05 15:48:24 +0000
committerRichard Brooksby2001-12-05 15:48:24 +0000
commit492dd3c684e53bd42b28371bdaaa99ad67ebd835 (patch)
tree59a2df0f685b93b44fbc03847b76782275308aaf /mps/code/protocol.c
parent25c78993edd7b4a607eba951b6ab2a9a51c55b62 (diff)
downloademacs-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/protocol.c')
-rw-r--r--mps/code/protocol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mps/code/protocol.c b/mps/code/protocol.c
index 8faec02f188..c2f32b66073 100644
--- a/mps/code/protocol.c
+++ b/mps/code/protocol.c
@@ -1,6 +1,6 @@
1/* impl.c.pool: PROTOCOL IMPLEMENTATION 1/* impl.c.pool: PROTOCOL IMPLEMENTATION
2 * 2 *
3 * $HopeName: MMsrc!protocol.c(trunk.2) $ 3 * $HopeName: MMsrc!protocol.c(trunk.3) $
4 * Copyright (C) 1998 Harlequin Limited. All rights reserved. 4 * Copyright (C) 1998 Harlequin Limited. All rights reserved.
5 * 5 *
6 * DESIGN 6 * DESIGN
@@ -11,7 +11,7 @@
11#include "mpm.h" 11#include "mpm.h"
12 12
13 13
14SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.2) $"); 14SRCID(protocol, "$HopeName: MMsrc!protocol.c(trunk.3) $");
15 15
16 16
17/* ProtocolClassCheck -- check a protocol class */ 17/* ProtocolClassCheck -- check a protocol class */