com php-src: Fixed version id: ext/intl/collator/collator_con vert.c ext/mysqli/mysqli.c ext/pdo/pdo_dbh.c ext/ phar/phar_object.c

Commit: d790eceb01009489358c3781c94ebea3b3400f67 Author: Xinchen Hui <laruence@php.net> Sat, 16 Aug 2014 16:44:02 +0800 Parents: c8250fa3e36a0f8978484f0cf402e84df8048161 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d790eceb01009489358c3781c94ebea3b3400f67 Log: Fixed version id Changed paths: M ext/intl/collator/collator_convert.c M ext/mysqli/mysqli.c M ext/pdo/pdo_dbh.c M ext/phar/phar_object.c Diff: diff --git a/ext/intl/collator/collator_convert.c b/ext/intl/collator/collator_convert..c index e64bf88..7d8bf0b 100644 --- a/ext/intl/collator/collator_convert.c +++ b/ext/intl/collator/collator_convert.c @@ -28,7 +28,7 @@ #include <unicode/ustring.h> #include <php.h> -#if PHP_VERSION_ID <= 51000 +#if PHP_VERSION_ID <= 50100 #define CAST_OBJECT_SHOULD_FREE ,0 #else #define CAST_OBJECT_SHOULD_FREE diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index fb93095..02e6898 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -585,7 +585,7 @@ PHP_MINIT_FUNCTION(mysqli) mysqli_object_handlers.write_property = mysqli_write_property; mysqli_object_handlers.get_property_ptr_ptr = std_hnd->get_property_ptr_ptr; mysqli_object_handlers.has_property = mysqli_object_has_property; -#if PHP_VERSION_ID >= 53000 +#if PHP_VERSION_ID >= 50300 mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info; #endif memcpy(&mysqli_object_driver_handlers, &mysqli_object_handlers, sizeof(zend_object_handlers)); diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 28e2608..cdf639a 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -1412,7 +1412,7 @@ void pdo_dbh_init(TSRMLS_D) REGISTER_PDO_CLASS_CONST_LONG("FETCH_UNIQUE",(long)PDO_FETCH_UNIQUE); REGISTER_PDO_CLASS_CONST_LONG("FETCH_KEY_PAIR",(long)PDO_FETCH_KEY_PAIR); REGISTER_PDO_CLASS_CONST_LONG("FETCH_CLASSTYPE",(long)PDO_FETCH_CLASSTYPE); -#if PHP_VERSION_ID >= 51000 +#if PHP_VERSION_ID >= 50100 REGISTER_PDO_CLASS_CONST_LONG("FETCH_SERIALIZE",(long)PDO_FETCH_SERIALIZE); #endif REGISTER_PDO_CLASS_CONST_LONG("FETCH_PROPS_LATE",(long)PDO_FETCH_PROPS_LATE); diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 74f06e7..e9acfe4 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -30,7 +30,7 @@ static zend_class_entry *phar_ce_PharException; static zend_class_entry *phar_ce_entry; #endif -#if PHP_VERSION_ID >= 53000 +#if PHP_VERSION_ID >= 50300 # define PHAR_ARG_INFO #else # define PHAR_ARG_INFO static