From b0d4fb39bebb20b06f47e9b274464e1092491189 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Wed, 11 Jun 2014 13:32:25 +0100
Subject: [PATCH] Fix incorrect merges.

Copied from Perforce
 Change: 186490
 ServerID: perforce.ravenbrook.com
---
 mps/code/freelist.h           |  5 +++--
 mps/code/gc.gmk               |  3 ++-
 mps/manual/source/release.rst | 14 --------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/mps/code/freelist.h b/mps/code/freelist.h
index fe20d48f985..dab791c9c03 100644
--- a/mps/code/freelist.h
+++ b/mps/code/freelist.h
@@ -15,10 +15,11 @@ typedef struct FreelistStruct *Freelist;
 
 #define FreelistLand(fl) (&(fl)->landStruct)
 
-#define FreelistMinimumAlignment ((Align)sizeof(FreelistBlock))
-
 extern Bool FreelistCheck(Freelist freelist);
 
+/* See <design/freelist/#impl.grain.align> */
+#define FreelistMinimumAlignment ((Align)sizeof(FreelistBlock))
+
 extern LandClass FreelistLandClassGet(void);
 
 #endif /* freelist.h */
diff --git a/mps/code/gc.gmk b/mps/code/gc.gmk
index d0ea64d404f..76716dc0785 100644
--- a/mps/code/gc.gmk
+++ b/mps/code/gc.gmk
@@ -25,7 +25,8 @@ CFLAGSCOMPILER := \
 	-Wshadow \
 	-Wstrict-aliasing=2 \
 	-Wstrict-prototypes \
-	-Wswitch-default
+	-Wswitch-default \
+	-Wwrite-strings
 CFLAGSCOMPILERSTRICT := -ansi -pedantic
 
 # A different set of compiler flags for less strict compilation, for
diff --git a/mps/manual/source/release.rst b/mps/manual/source/release.rst
index 2696ad26998..a866fb566f4 100644
--- a/mps/manual/source/release.rst
+++ b/mps/manual/source/release.rst
@@ -74,20 +74,6 @@ Interface changes
    pools that they are used with. This makes it easier to reuse these
    structures.
 
-#. There is now a default value (currently 1 \ :term:`megabyte`) for
-   the :c:macro:`MPS_KEY_ARENA_SIZE` keyword argument to
-   :c:func:`mps_arena_create_k` when creating a virtual memory arena.
-   See :c:func:`mps_arena_class_vm`.
-
-#. The keyword argument :c:macro:`MPS_KEY_AMS_SUPPORT_AMBIGUOUS` now
-   defaults to ``TRUE`` in order to better support the general case:
-   the value ``FALSE`` is appropriate only when you know that all
-   references are exact. See :ref:`pool-ams`.
-
-#. The :ref:`pool-mvff` pool class takes a new keyword argument
-   :c:macro:`MPS_KEY_SPARE`. This specifies the maximum proportion of
-   memory that the pool will keep spare for future allocations.
-
 
 Other changes
 .............