svn: /php/php-src/ branches/PHP_5_4/ext/standard/php_var.h trunk/ext/standard/php_var.h
| From: | Dmitry Stogov | Date: | Wed, 11 Jan 2012 15:04:14 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/ext/standard/php_var.h trunk/ext/standard/php_var.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67439@lists.php.net to get a copy of this message | ||
dmitry Wed, 11 Jan 2012 15:04:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=322070
Log:
Fixed incorrect type cast
Changed paths:
U php/php-src/branches/PHP_5_4/ext/standard/php_var.h
U php/php-src/trunk/ext/standard/php_var.h
Modified: php/php-src/branches/PHP_5_4/ext/standard/php_var.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/php_var.h 2012-01-11 14:55:54 UTC (rev 322069)
+++ php/php-src/branches/PHP_5_4/ext/standard/php_var.h 2012-01-11 15:04:14 UTC (rev 322070)
@@ -93,7 +93,7 @@
BG(unserialize).level = 1; \
} \
} else { \
- (var_hash_ptr) = (php_serialize_data_t)BG(unserialize).var_hash; \
+ (var_hash_ptr) = (php_unserialize_data_t)BG(unserialize).var_hash; \
++BG(unserialize).level; \
} \
} while (0)
Modified: php/php-src/trunk/ext/standard/php_var.h
===================================================================
--- php/php-src/trunk/ext/standard/php_var.h 2012-01-11 14:55:54 UTC (rev 322069)
+++ php/php-src/trunk/ext/standard/php_var.h 2012-01-11 15:04:14 UTC (rev 322070)
@@ -93,7 +93,7 @@
BG(unserialize).level = 1; \
} \
} else { \
- (var_hash_ptr) = (php_serialize_data_t)BG(unserialize).var_hash; \
+ (var_hash_ptr) = (php_unserialize_data_t)BG(unserialize).var_hash; \
++BG(unserialize).level; \
} \
} while (0)