Skip to content

Commit

Permalink
Fixed windows compile error.
Browse files Browse the repository at this point in the history
  • Loading branch information
andot committed Jan 6, 2016
1 parent 787f10b commit 8601ba7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
7 changes: 4 additions & 3 deletions hprose_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* *
* hprose reader for pecl header file. *
* *
* LastModified: Jan 5, 2016 *
* LastModified: Jan 6, 2016 *
* Author: Ma Bingyao <[email protected]> *
* *
\**********************************************************/
Expand Down Expand Up @@ -657,10 +657,11 @@ static zend_always_inline void hprose_reader_read_object_without_tag(hprose_read
zend_class_entry *scope = __create_php_object(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), return_value TSRMLS_CC, "");
hprose_reader_refer_set(_this->refer, return_value);
if (i) {
zend_hash_internal_pointer_reset(props_ht);

zend_class_entry *old_scope = EG(scope);
EG(scope) = scope;

zend_hash_internal_pointer_reset(props_ht);

if (!Z_OBJ_HT_P(return_value)->write_property) {
zend_error_noreturn(E_CORE_ERROR, "Properties of class %s cannot be updated", Z_STRVAL_P(class_name));
}
Expand Down
25 changes: 19 additions & 6 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,18 @@ http://pear.php.net/dtd/package-2.0.xsd">
<email>[email protected]</email>
<active>yes</active>
</lead>
<date>2016-01-05</date>
<time>23:04:44</time>
<date>2016-01-06</date>
<time>10:08:11</time>
<version>
<release>1.6.2</release>
<api>1.6.2</api>
<release>1.6.3</release>
<api>1.6.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://mit-license.org/">MIT</license>
<notes>Fixed some memory leaks.
Fixed properties serialization with first capital letter.
<notes>Fixed windows compile error.
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -113,6 +112,20 @@ http://pear.php.net/dtd/package-2.0.xsd">
<configureoption default="yes" name="enable-hprose" prompt="whether to enable hprose support" />
</extsrcrelease>
<changelog>
<release>
<version>
<release>1.6.3</release>
<api>1.6.3</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-01-06</date>
<license uri="http://mit-license.org/">MIT</license>
<notes>Fixed windows compile error.
</notes>
</release>
<release>
<version>
<release>1.6.2</release>
Expand Down
2 changes: 1 addition & 1 deletion php_hprose.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ zend_module_entry hprose_module_entry;

#define PHP_HPROSE_MODULE_NAME "hprose"
#define PHP_HPROSE_BUILD_DATE __DATE__ " " __TIME__
#define PHP_HPROSE_VERSION "1.6.2"
#define PHP_HPROSE_VERSION "1.6.3"
#define PHP_HPROSE_AUTHOR "Ma Bingyao"
#define PHP_HPROSE_HOMEPAGE "https://github.com/hprose/hprose-pecl"

Expand Down

0 comments on commit 8601ba7

Please sign in to comment.