diff options
| author | Anatol Belski <ab@php.net> | 2018-04-29 19:39:57 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-04-29 19:39:57 +0200 |
| commit | cf45479a19aa987d5d8fc447c27d58b3bca566a1 (patch) | |
| tree | cfb831b6c6ae4592c8d0c236816a3edff5eff903 | |
| parent | 5295c35f69eae5382546727f96fcf920460c872c (diff) | |
| download | php-git-cf45479a19aa987d5d8fc447c27d58b3bca566a1.tar.gz | |
Reuse strcasestr implementation from libmagic
| -rw-r--r-- | ext/fileinfo/config.w32 | 2 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/readcdf.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32 index eb5180c25e..680ca60b40 100644 --- a/ext/fileinfo/config.w32 +++ b/ext/fileinfo/config.w32 @@ -9,7 +9,7 @@ if (PHP_FILEINFO != 'no') { encoding.c fsmagic.c funcs.c \ is_tar.c magic.c print.c \ readcdf.c softmagic.c der.c \ - buffer.c"; + strcasestr.c buffer.c"; EXTENSION('fileinfo', 'fileinfo.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname); ADD_SOURCES(configure_module_dirname + '\\libmagic', LIBMAGIC_SOURCES, "fileinfo"); diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c index f14e7693f9..5f67632f50 100644 --- a/ext/fileinfo/libmagic/readcdf.c +++ b/ext/fileinfo/libmagic/readcdf.c @@ -79,10 +79,6 @@ static const struct nv { { NULL, NULL, }, }; -#ifdef PHP_WIN32 -# define strcasestr strstr -#endif - static const struct cv { uint64_t clsid[2]; const char *mime; |