From: Greg Beaver <cellog@php.net>
Date: Sat, 12 Jan 2008 16:18:26 +0000 (+0000)
Subject: fix conflict on win32 if phar compiled statically
X-Git-Tag: RELEASE_2_0_0a1~934
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64cb8c81118b962b613afb50c946d0c2b9382477;p=php

fix conflict on win32 if phar compiled statically
---

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index 835c736b8a..c5a9be4e65 100644
--- 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 74f737d29f..b8a27d3113 100644
--- 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)
 {