From cf45479a19aa987d5d8fc447c27d58b3bca566a1 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 29 Apr 2018 19:39:57 +0200 Subject: [PATCH] Reuse strcasestr implementation from libmagic --- ext/fileinfo/config.w32 | 2 +- ext/fileinfo/libmagic/readcdf.c | 4 ---- 2 files changed, 1 insertion(+), 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; -- 2.40.0