localedef: Do not compile with mcheck

__malloc_initialize_hook is deprecated.

diff --git a/ChangeLog b/ChangeLog
index 7533a3d9dee2138a24ad8a60a44548f4dd74aa63..807821744402f65e7a949ee28c74495a65b160a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-11  Florian Weimer  <fweimer@redhat.com>
+
+       Do not use mcheck in localedef.
+       * locale/programs/localedef.c (turn_on_mcheck)
+       (__malloc_initialize_hook): Remove.
+
 2016-05-11  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
        * sysdeps/s390/s390-32/Makefile (pic-ccflag): Remove.

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index 6becd9aa2ed7704eeefdc120d0cef90f56cd4654..bfc5d22eaec77999e0dc04d9b6be1b5d1b9e83b2 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -24,7 +24,6 @@
 #include <fcntl.h>
 #include <libintl.h>
 #include <locale.h>
-#include <mcheck.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -634,14 +633,3 @@ cannot open locale definition file `%s'"), result->name));
 
   return result;
 }
-
-static void
-turn_on_mcheck (void)
-{
-  /* Enable `malloc' debugging.  */
-  mcheck (NULL);
-  /* Use the following line for a more thorough but much slower testing.  */
-  /* mcheck_pedantic (NULL); */
-}
-
-void (*__malloc_initialize_hook) (void) = turn_on_mcheck;