cellog Fri, 24 Jul 2009 21:27:51 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=284722
Log: fix PHAR_ARG_INFO #define to work with PHP major versions > 5 Changed paths: U pecl/phar/trunk/phar_object.c U php/php-src/branches/PHP_5_3/ext/phar/phar_object.c U php/php-src/trunk/ext/phar/phar_object.c Modified: pecl/phar/trunk/phar_object.c =================================================================== --- pecl/phar/trunk/phar_object.c 2009-07-24 21:10:51 UTC (rev 284721) +++ pecl/phar/trunk/phar_object.c 2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static Modified: php/php-src/branches/PHP_5_3/ext/phar/phar_object.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-24 21:10:51 UTC (rev 284721) +++ php/php-src/branches/PHP_5_3/ext/phar/phar_object.c 2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static Modified: php/php-src/trunk/ext/phar/phar_object.c =================================================================== --- php/php-src/trunk/ext/phar/phar_object.c 2009-07-24 21:10:51 UTC (rev 284721) +++ php/php-src/trunk/ext/phar/phar_object.c 2009-07-24 21:27:51 UTC (rev 284722) @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_entry; #endif -#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) +#if PHP_MAJOR_VERSION > 5 || ((PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)) # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php