5 files changed, 21 insertions, 41 deletions

diff --git a/mps/code/config.h b/mps/code/config.h
index 75ceb2131c0..6c4f8a49e0d 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -268,11 +268,6 @@
 #elif defined(CONFIG_PROD_DYLAN)
 #define MPS_PROD_STRING         "dylan"
 #define MPS_PROD_DYLAN
-/* .prod.arena-size: ARENA_SIZE is currently set larger for the
- * MM/Dylan product as an interim solution.
- * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170.
- */
-#define ARENA_SIZE              ((Size)1<<30)
 #define ARENA_INIT_SPARE_COMMIT_LIMIT   ((Size)10uL*1024uL*1024uL)
 #define THREAD_MULTI
 #define PROTECTION
@@ -292,6 +287,14 @@
 #error "No target product configured."
 #endif
 
+/* .prod.arena-size: ARENA_SIZE is currently set larger for the
+ * MM/Dylan product as an interim solution.
+ * See request.dylan.170170.sol.patch and change.dylan.buffalo.170170.
+ * Note that this define is only used by the implementation of the
+ * deprecated mps_space_create interface.
+ */
+#define ARENA_SIZE              ((Size)1<<30)
+
 /* if CHECK_DEFAULT hasn't been defined already (e.g. by a variety, or
  * in a makefile), take the value from the product. */
 
diff --git a/mps/code/expgen.sh b/mps/code/expgen.sh
index 54c8daca2dc..7e534e88e40 100755
--- a/mps/code/expgen.sh
+++ b/mps/code/expgen.sh
@@ -71,7 +71,10 @@ tu () {
 
 # This list of header files is produced by
 # awk '/^copy.*\.h/{print $2}' w3build.bat
-# followed by manual removal of mpsw3.h mpswin.h.
+# followed by manual removal of mpsw3.h mpswin.h (which gcc on UNIX
+# cannot parse).  Also removed are mpsio.h mpslib.h as they defined
+# interfaces that mps _uses_ not defines.  Also removed is mpscmvff.h as
+# it does not get included in mps.lib
 # The functions declared in mpsw3.h have to be added to the .def file by
 # hand later in this script.
 f='mps.h
@@ -82,10 +85,7 @@ mpscams.h
 mpscawl.h
 mpsclo.h
 mpscmv.h
-mpscmvff.h
 mpscsnc.h
-mpsio.h
-mpslib.h
 mpstd.h'
 
 tu $f
@@ -107,7 +107,7 @@ do
 done
 
 {
-  printf '%sHeader%s\n' '$' '$'
+  printf '; %sHeader%s\n' '$' '$'
   echo '; DO NOT EDIT.  Automatically generated by $Header$' | sed 's/\$/!/g'
   echo 'EXPORTS'
   cat expgen
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 53edb1a9fed..8952ebe1d32 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -273,7 +273,10 @@ extern mps_bool_t mps_arena_has_addr(mps_arena_t, mps_addr_t);
 
 /* Client memory arenas */
 extern mps_res_t mps_arena_extend(mps_arena_t, mps_addr_t, size_t);
+#if 0
+/* There's no implementation for this function. */
 extern mps_res_t mps_arena_retract(mps_arena_t, mps_addr_t, size_t);
+#endif
 
 
 /* Object Formats */
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 53fda434dd1..9bf1a478ff4 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -443,12 +443,11 @@ mps_res_t mps_arena_create_v(mps_arena_t *mps_arena_o,
   return MPS_RES_OK;
 }
 
-#ifdef MPS_PROD_DYLAN
+/* DEPRECATED */
 mps_res_t mps_space_create(mps_space_t *mps_space_o)
 {
   return mps_arena_create(mps_space_o, mps_arena_class_vm(), ARENA_SIZE);
 }
-#endif
 
 
 /* mps_arena_destroy -- destroy an arena object */
@@ -461,12 +460,11 @@ void mps_arena_destroy(mps_arena_t mps_arena)
   ArenaDestroy(arena);
 }
 
-#ifdef MPS_PROD_DYLAN
+/* DEPRECATED */
 void mps_space_destroy(mps_space_t mps_space)
 {
   mps_arena_destroy(mps_space);
 }
-#endif
 
 
 /* mps_arena_has_addr -- is this address managed by this arena? */
diff --git a/mps/code/w3gen.def b/mps/code/w3gen.def
index 41b6e4f22c9..8f3927bb816 100644
--- a/mps/code/w3gen.def
+++ b/mps/code/w3gen.def
@@ -1,5 +1,5 @@
-$Header$
-; DO NOT EDIT.  Automatically generated by !Header!
+; $Header$
+; DO NOT EDIT.  Automatically generated by !Header: //info.ravenbrook.com/project/mps/branch/2004-12-15/dll/code/expgen.sh#1 !
 EXPORTS
 ; mps.h
 mps_ap_fill_with_reservoir_permit
@@ -22,12 +22,11 @@ mps_fmt_create_fixed
 mps_fmt_create_auto_header
 mps_fmt_create_B
 mps_fmt_create_A
-mps_arena_retract
 mps_arena_extend
 mps_arena_has_addr
 mps_space_committed
-mps_arena_formatted_objects_walk
 mps_space_reserved
+mps_arena_formatted_objects_walk
 mps_arena_spare_commit_limit
 mps_arena_spare_commit_limit_set
 mps_arena_commit_limit_set
@@ -132,31 +131,8 @@ mps_mv_size
 mps_class_mv_debug
 mps_mv_free_size
 mps_class_mv
-; mpscmvff.h
-mps_mvff_size
-mps_class_mvff_debug
-mps_mvff_free_size
-mps_class_mvff
 ; mpscsnc.h
 mps_class_snc
-; mpsio.h
-mps_io_flush
-mps_io_destroy
-mps_io_create
-mps_io_write
-; mpslib.h
-mps_lib_fputc
-mps_lib_get_stdout
-mps_lib_get_stderr
-mps_lib_get_EOF
-mps_clock
-mps_lib_telemetry_control
-mps_lib_memcmp
-mps_lib_memcpy
-mps_lib_memset
-mps_clocks_per_sec
-mps_lib_assert_fail
-mps_lib_fputs
 ; mpstd.h
 ; mpsw3.h - by hand
 mps_SEH_filter