From 24f967c9f56237eafe18039fec195731170bd162 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Tue, 8 Nov 2005 13:57:41 +0000
Subject: [PATCH] fix fixes

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1446 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/alloc.c        | 6 ++----
 changes-5.1.html | 6 ++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/C/alloc.c b/C/alloc.c
index f3ca7327f..e58657060 100644
--- a/C/alloc.c
+++ b/C/alloc.c
@@ -12,7 +12,7 @@
 * Last rev:								 *
 * mods:									 *
 * comments:	allocating space					 *
-* version:$Id: alloc.c,v 1.73 2005-11-08 13:51:15 vsc Exp $		 *
+* version:$Id: alloc.c,v 1.74 2005-11-08 13:57:41 vsc Exp $		 *
 *************************************************************************/
 #ifdef SCCS
 static char SccsId[] = "%W% %G%";
@@ -68,8 +68,6 @@ static char SccsId[] = "%W% %G%";
 long long unsigned int mallocs, reallocs, frees;
 long long unsigned int tmalloc;
 
-#include <malloc.h>
-
 #if INSTRUMENT_MALLOC
 static void
 minfo(char mtype)
@@ -269,9 +267,9 @@ Yap_ExtendWorkSpace(Int s)
   void *bp = (void *)Yap_GlobalBase, *nbp;
   UInt s0 = (char *)Yap_TrailTop-(char *)Yap_GlobalBase;
   nbp = realloc(bp, s+s0);
-  Yap_GlobalBase = (char *)nbp;
   if (nbp == NULL) 
     return FALSE;
+  Yap_GlobalBase = (char *)nbp;
   return TRUE;
 }
 
diff --git a/changes-5.1.html b/changes-5.1.html
index 24a12cc3b..1c7de6989 100644
--- a/changes-5.1.html
+++ b/changes-5.1.html
@@ -16,9 +16,11 @@
 
 <h2>Yap-5.1.0:</h2>
 <ul>
-<li> FIXED: adjust_cp_hbs was looking at readjusting consumer choice-points. </li>
+<li> FIXED: plug holes in memory allocation from scanner. </li>
+<li> FIXED: instrument memory allocation use use_malloc. </li>
+<li> FIXED: adjust_cp_hbs was readjusting consumer choice-points (it
+  can only adjust hb once). </li>
 <li> FIXED: try to make GC trace message "marked  N vars" intelligible. </li>
-<li> FIXED: try to make marked N vars message intelligible. </li>
 <li> FIXED: garbage collection of mabindings was broken with tabling. </li>
 <li> FIXED: should have meta-predicate definitions for calls and
 discontiguous. </li>