cellog Sat Jan 12 16:18:25 2008 UTC
Modified files:
/pecl/phar config.w32 phar.c
Log:
fix conflict on win32 if phar compiled statically
http://cvs.php.net/viewvc.cgi/pecl/phar/config.w32?r1=1.18&r2=1.19&diff_format=u
Index: pecl/phar/config.w32
diff -u pecl/phar/config.w32:1.18 pecl/phar/config.w32:1.19
--- pecl/phar/config.w32:1.18 Sat Jan 12 04:32:17 2008
+++ pecl/phar/config.w32 Sat Jan 12 16:18:25 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.18 2008/01/12 04:32:17 cellog Exp $
+// $Id: config.w32,v 1.19 2008/01/12 16:18:25 cellog Exp $
// vim:ft=javascript
ARG_ENABLE("phar", "enable phar support", "no");
@@ -9,6 +9,9 @@
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);
http://cvs.php.net/viewvc.cgi/pecl/phar/phar.c?r1=1.267&r2=1.268&diff_format=u
Index: pecl/phar/phar.c
diff -u pecl/phar/phar.c:1.267 pecl/phar/phar.c:1.268
--- pecl/phar/phar.c:1.267 Sat Jan 12 16:15:16 2008
+++ pecl/phar/phar.c Sat Jan 12 16:18:25 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar.c,v 1.267 2008/01/12 16:15:16 cellog Exp $ */
+/* $Id: phar.c,v 1.268 2008/01/12 16:18:25 cellog Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -1852,7 +1852,7 @@
#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)
{
@@ -3306,7 +3306,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHAR_EXT_VERSION_STR);
php_info_print_table_row(2, "Phar API version", PHAR_API_VERSION_STR);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.267 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.268 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
#if HAVE_PHAR_ZIP
|