1*4882a593SmuzhiyunFrom e4788a0f9d820574a165b2609ff16b717ce0baba Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 19 Sep 2020 18:51:15 +0200 4*4882a593SmuzhiyunSubject: [PATCH] fix build without mbstate_t 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunCommit 41911aac46d69df6a205af59d60f23a418b0e875 tried to fix build 7*4882a593Smuzhiyunwithout wchar by checking for the availability of wchar.h however some 8*4882a593Smuzhiyuntoolchains have wchar.h but does not define mbstate_t and mbsrtowcs so 9*4882a593Smuzhiyunreplace HAVE_WCHAR_H by HAVE_MBSRTOWCS 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunFixes: 12*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/27f184af35468941173628e5e847a284c0b80d73 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15*4882a593Smuzhiyun[Upstream status: 16*4882a593Smuzhiyunhttps://github.com/rpm-software-management/popt/pull/51] 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun configure.ac | 4 ++-- 19*4882a593Smuzhiyun src/popthelp.c | 4 ++-- 20*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 4 deletions(-) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 23*4882a593Smuzhiyunindex 1fce6df..442086b 100644 24*4882a593Smuzhiyun--- a/configure.ac 25*4882a593Smuzhiyun+++ b/configure.ac 26*4882a593Smuzhiyun@@ -18,7 +18,7 @@ LT_INIT 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun AC_SYS_LARGEFILE 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun-AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h]) 31*4882a593Smuzhiyun+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun # For some systems we know that we have ld_version scripts. 34*4882a593Smuzhiyun # Use it then as default. 35*4882a593Smuzhiyun@@ -50,7 +50,7 @@ AC_ARG_ENABLE([build-gcov], 36*4882a593Smuzhiyun ]) 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun AC_SEARCH_LIBS([setreuid], [ucb]) 39*4882a593Smuzhiyun-AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) 40*4882a593Smuzhiyun+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs]) 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun AM_GNU_GETTEXT_VERSION([0.18.2]) 43*4882a593Smuzhiyun AM_GNU_GETTEXT([external]) 44*4882a593Smuzhiyundiff --git a/src/popthelp.c b/src/popthelp.c 45*4882a593Smuzhiyunindex f604516..b4ab9b4 100644 46*4882a593Smuzhiyun--- a/src/popthelp.c 47*4882a593Smuzhiyun+++ b/src/popthelp.c 48*4882a593Smuzhiyun@@ -15,7 +15,7 @@ 49*4882a593Smuzhiyun #include <sys/ioctl.h> 50*4882a593Smuzhiyun #endif 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun-#ifdef HAVE_WCHAR_H 53*4882a593Smuzhiyun+#ifdef HAVE_MBSRTOWCS 54*4882a593Smuzhiyun #include <wchar.h> /* for mbsrtowcs */ 55*4882a593Smuzhiyun #endif 56*4882a593Smuzhiyun #include "poptint.h" 57*4882a593Smuzhiyun@@ -117,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp) 58*4882a593Smuzhiyun static inline size_t stringDisplayWidth(const char *s) 59*4882a593Smuzhiyun { 60*4882a593Smuzhiyun size_t n = strlen(s); 61*4882a593Smuzhiyun-#ifdef HAVE_WCHAR_H 62*4882a593Smuzhiyun+#ifdef HAVE_MBSRTOWCS 63*4882a593Smuzhiyun mbstate_t t; 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ 66*4882a593Smuzhiyun-- 67*4882a593Smuzhiyun2.28.0 68*4882a593Smuzhiyun 69