Update.

	* locale/programs/localedef.c (construct_output_path): If path
	contains a / compute the end of the directory name correctly.

2 files changed, 6 insertions, 3 deletions

diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index 42e8e71174..0d32fc17f7 100644
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -111,12 +111,18 @@ check_all ()
      with.  */
   struct hdr *runp = root;
 
+  /* Temporarily turn off the checks.  */
+  pedantic = 0;
+
   while (runp != NULL)
     {
       (void) checkhdr (runp);
 
       runp = runp->next;
     }
+
+  /* Turn checks on again.  */
+  pedantic = 1;
 }
 
 static void unlink_blk __P ((struct hdr *ptr));
diff --git a/malloc/mcheck.h b/malloc/mcheck.h
index 9460547d08..2b8bbb2cbf 100644
--- a/malloc/mcheck.h
+++ b/malloc/mcheck.h
@@ -45,9 +45,6 @@ extern int mcheck (void (*__abortfunc) (enum mcheck_status)) __THROW;
    the memory handling functions is called.  This can be very slow.  */
 extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) __THROW;
 
-/* Similar to `mcheck', but perform tests on all blocks every time.  */
-extern int mcheck_verbose (void (*func) __P ((enum mcheck_status)));
-
 /* Check for aberrations in a particular malloc'd block.  You must have
    called `mcheck' already.  These are the same checks that `mcheck' does
    when you free or reallocate a block.  */