From 74e8e4418738294ea0affe93807e038ef5ac35ed Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Sun, 9 Feb 2020 18:08:15 +0000 Subject: avoid multiple definition of 'mp_snprintf_res' git-svn-id: svn://tug.org/texlive/trunk@53728 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/mplibdir/mp.w | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w index d7a284335b5..279739f8569 100644 --- a/Build/source/texk/web2c/mplibdir/mp.w +++ b/Build/source/texk/web2c/mplibdir/mp.w @@ -2960,11 +2960,15 @@ void *mp_xmalloc (MP mp, size_t nmem, size_t size) { } @ @= -int mp_snprintf_res ; +/*int mp_snprintf_res ;*/ /* Some compilers (i.e. gcc 8.2.0 ) complained with the old */ /* #define mp_snprintf (void)snprintf */ /* about truncation. For the moment we store the result. */ -# define mp_snprintf mp_snprintf_res=snprintf +/*# define mp_snprintf mp_snprintf_res=snprintf */ +/* Now gcc 10 does't like common symbols, so we switch back */ +/* to the old define. */ +#define mp_snprintf (void)snprintf + @* Dynamic memory allocation. -- cgit v1.2.3