fix conflict on win32 if phar compiled statically

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index 835c736b8acdf395d94247057a4ba7beb84946c2..c5a9be4e6571e0319c74022e8da3e28aab325d4f 100644 (file)
--- a/ext/phar/config.w32
+++ b/ext/phar/config.w32
@@ -9,6 +9,9 @@ if (PHP_PHAR != "no") {
        if (PHP_ZIP_SHARED) {
                ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_ZIP ");
        }
+       if (PHP_PHAR_SHARED) {
+               ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_PHAR ");
+       }
        if (PHP_ZIP != "no") {
                ADD_EXTENSION_DEP('phar', 'zip', true);
                AC_DEFINE('HAVE_PHAR_ZIP', 1);

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 74f737d29fefabda5fbd29fa4dc1e0669a9cee70..b8a27d3113e4d9b693908afd8aca78846bf2ffcb 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1852,7 +1852,7 @@ static int php_check_dots(const char *element, int n)
 
 #define IS_BACKSLASH(c)     ((c) == '/')
 
-#ifdef PHP_WIN32
+#ifdef COMPILE_PHAR_DL
 /* stupid-ass non-extern declaration in tsrm_strtok.h breaks dumbass MS compiler */
 static inline int in_character_class(char ch, const char *delim)
 {