aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code/mpstd.h
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/mpstd.h
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/mpstd.h')
-rw-r--r--mps/code/mpstd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index 766e0da1980..fd653d40a73 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -1,6 +1,6 @@
1/* impl.h.mpstd: HARLEQUIN MEMORY POOL SYSTEM TARGET DETECTION 1/* impl.h.mpstd: HARLEQUIN MEMORY POOL SYSTEM TARGET DETECTION
2 * 2 *
3 * $HopeName: MMsrc!mpstd.h(trunk.27) $ 3 * $HopeName: MMsrc!mpstd.h(trunk.28) $
4 * Copyright (C) 2000 Harlequin Limited. All rights reserved. 4 * Copyright (C) 2000 Harlequin Limited. All rights reserved.
5 * 5 *
6 * Detect the target platform using predefined preprocessor symbols 6 * Detect the target platform using predefined preprocessor symbols