diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-05-11 16:56:59 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-05-11 16:56:59 +0200 |
| commit | 1ac3eaa6bcc473a56340c24511786ff48a91293e (patch) | |
| tree | 7dbe852a21d5b2cba6341f1e94d17854481cca67 | |
| parent | c64a10e54441db7df85592b009348a919a7259d7 (diff) | |
| download | glibc-1ac3eaa6bcc473a56340c24511786ff48a91293e.tar.gz glibc-1ac3eaa6bcc473a56340c24511786ff48a91293e.tar.xz glibc-1ac3eaa6bcc473a56340c24511786ff48a91293e.zip | |
localedef: Do not compile with mcheck
__malloc_initialize_hook is deprecated.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 7533a3d9de..8078217444 100644 --- 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 6becd9aa2e..bfc5d22eae 100644 --- 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; |