From 6d2f4a640ae35239b35adef929e7ab976a79dcbc Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Fri, 13 Jun 2014 11:17:28 +0100
Subject: [PATCH] Avoid local variable "free" shadowing standard c function
 free().

Copied from Perforce
 Change: 186554
 ServerID: perforce.ravenbrook.com
---
 mps/code/apss.c  | 6 +++---
 mps/code/mpmss.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mps/code/apss.c b/mps/code/apss.c
index 7ee07d356bd..ab35d48cc96 100644
--- a/mps/code/apss.c
+++ b/mps/code/apss.c
@@ -45,10 +45,10 @@ static mps_res_t make(mps_addr_t *p, mps_ap_t ap, size_t size)
 
 static void check_allocated_size(mps_pool_t pool, mps_ap_t ap, size_t allocated)
 {
-  size_t total = mps_pool_total_size(pool);
-  size_t free = mps_pool_free_size(pool);
+  size_t total_size = mps_pool_total_size(pool);
+  size_t free_size = mps_pool_free_size(pool);
   size_t ap_free = (size_t)((char *)ap->limit - (char *)ap->init);
-  Insist(total - free == allocated + ap_free);
+  Insist(total_size - free_size == allocated + ap_free);
 }
 
 
diff --git a/mps/code/mpmss.c b/mps/code/mpmss.c
index 078c0d6ff68..ca1e6a2980e 100644
--- a/mps/code/mpmss.c
+++ b/mps/code/mpmss.c
@@ -28,9 +28,9 @@
 
 static void check_allocated_size(mps_pool_t pool, size_t allocated)
 {
-  size_t total = mps_pool_total_size(pool);
-  size_t free = mps_pool_free_size(pool);
-  Insist(total - free == allocated);
+  size_t total_size = mps_pool_total_size(pool);
+  size_t free_size = mps_pool_free_size(pool);
+  Insist(total_size - free_size == allocated);
 }