summaryrefslogtreecommitdiff
path: root/ext/fileinfo/libmagic
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2020-03-29 01:10:15 +0100
committerGeorge Peter Banyard <girgias@php.net>2020-03-31 00:14:56 +0200
commit457380cae7813a4a34faa1f9a49fa121395fe290 (patch)
treea5c0b8a34894a881782ed0612279841776f8960f /ext/fileinfo/libmagic
parentaa47543cb46a14525a69dc64385019b6c1d8583b (diff)
downloadphp-git-457380cae7813a4a34faa1f9a49fa121395fe290.tar.gz
Drop wchar header check as always defined since C95
Diffstat (limited to 'ext/fileinfo/libmagic')
-rw-r--r--ext/fileinfo/libmagic/funcs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c
index db8877e0d5..6561f7458b 100644
--- a/ext/fileinfo/libmagic/funcs.c
+++ b/ext/fileinfo/libmagic/funcs.c
@@ -35,12 +35,8 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.104 2019/05/07 02:27:11 christos Exp $")
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#if defined(HAVE_WCHAR_H)
#include <wchar.h>
-#endif
-#if defined(HAVE_WCTYPE_H)
#include <wctype.h>
-#endif
#include <limits.h>
#ifndef SIZE_MAX
@@ -438,7 +434,7 @@ file_getbuffer(struct magic_set *ms)
}
ms->o.pbuf = pbuf;
-#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH)
+#if defined(HAVE_WCWIDTH)
{
mbstate_t state;
wchar_t nextchar;