Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix

PHP7: fix ubuntu compile error
pull/7714/head
Stanley Cheung 9 years ago committed by GitHub
commit a6f6b6f4c9
  1. 2
      examples/php/route_guide/README.md
  2. 19
      package.xml
  3. 3
      src/php/ext/grpc/php7_wrapper.h
  4. 19
      templates/package.xml.template

@ -1,6 +1,6 @@
#gRPC Basics: PHP sample code
The files in this folder are the samples used in [gRPC Basics: PHP][],
a detailed tutorial for using gRPC in Ruby.
a detailed tutorial for using gRPC in PHP.
[gRPC Basics: PHP]:http://www.grpc.io/docs/tutorials/basic/php.html

@ -10,7 +10,7 @@
<email>grpc-packages@google.com</email>
<active>yes</active>
</lead>
<date>2016-07-28</date>
<date>2016-08-09</date>
<time>16:06:07</time>
<version>
<release>1.0.0</release>
@ -22,7 +22,7 @@
</stability>
<license>BSD</license>
<notes>
- PHP7 Support continued, reduce code duplication #7543
- Fixed Ubuntu compile error #7571, #7642
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@ -1131,5 +1131,20 @@ Update to wrap gRPC C Core version 0.10.0
- PHP7 Support continued, reduce code duplication #7543
</notes>
</release>
<release>
<version>
<release>1.0.0RC4</release>
<api>1.0.0RC4</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-08-09</date>
<license>BSD</license>
<notes>
- Fixed Ubuntu compile error #7571, #7642
</notes>
</release>
</changelog>
</package>

@ -143,8 +143,7 @@ static inline int php_grpc_zend_hash_find(HashTable *ht, char *key, int len,
#define PHP_GRPC_RETURN_STRING(val, dup) RETURN_STRING(val)
#define PHP_GRPC_MAKE_STD_ZVAL(pzv) \
zval _stack_zval_##pzv; \
pzv = &(_stack_zval_##pzv)
pzv = (zval *)emalloc(sizeof(zval));
#define PHP_GRPC_DELREF(zv)
#define PHP_GRPC_WRAP_OBJECT_START(name) \

@ -12,7 +12,7 @@
<email>grpc-packages@google.com</email>
<active>yes</active>
</lead>
<date>2016-07-28</date>
<date>2016-08-09</date>
<time>16:06:07</time>
<version>
<release>${settings.php_version.php()}</release>
@ -24,7 +24,7 @@
</stability>
<license>BSD</license>
<notes>
- PHP7 Support continued, reduce code duplication #7543
- Fixed Ubuntu compile error #7571, #7642
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@ -249,5 +249,20 @@
- PHP7 Support continued, reduce code duplication #7543
</notes>
</release>
<release>
<version>
<release>1.0.0RC4</release>
<api>1.0.0RC4</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2016-08-09</date>
<license>BSD</license>
<notes>
- Fixed Ubuntu compile error #7571, #7642
</notes>
</release>
</changelog>
</package>

Loading…
Cancel
Save