Reuse strcasestr implementation from libmagic

diff --git a/ext/fileinfo/config.w32 b/ext/fileinfo/config.w32
index eb5180c25e91cba0d43939d7c0efcea34284323c..680ca60b4065ebe75aa624c51878322c4ea84c9d 100644 (file)
--- 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 f14e7693f9f3edce1d4cd9ab52974542453f4a19..5f67632f5089cf79cf98976c9505509fa2edc962 100644 (file)
--- 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;