aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code/protso.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/protso.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/protso.c')
-rw-r--r--mps/code/protso.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mps/code/protso.c b/mps/code/protso.c
index 192a61b3323..c662d6cfe52 100644
--- a/mps/code/protso.c
+++ b/mps/code/protso.c
@@ -1,6 +1,6 @@
1/* impl.c.protso: PROTECTION FOR SOLARIS 1/* impl.c.protso: PROTECTION FOR SOLARIS
2 * 2 *
3 * $HopeName: MMsrc!protso.c(trunk.5) $ 3 * $HopeName: MMsrc!protso.c(trunk.6) $
4 * Copyright (C) 1995,1997 Harlequin Group, all rights reserved 4 * Copyright (C) 1995,1997 Harlequin Group, all rights reserved
5 * 5 *
6 */ 6 */
@@ -29,7 +29,7 @@
29#error "protso.c is Solaris specific, but MPS_OS_SO is not set" 29#error "protso.c is Solaris specific, but MPS_OS_SO is not set"
30#endif 30#endif
31 31
32SRCID(protso, "$HopeName: MMsrc!protso.c(trunk.5) $"); 32SRCID(protso, "$HopeName: MMsrc!protso.c(trunk.6) $");
33 33
34 34
35/* Fix up unprototyped system calls. */ 35/* Fix up unprototyped system calls. */