From d49be1d46a5015f4b7daf1cb56754ba791cf9ec5 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 8 Mar 2013 12:59:52 +0000 Subject: [PATCH] fix bug #64380 (http_message_object.c build fails in 5.5.0alpha6) --- http_message_object.c | 6 +++--- missing.h | 6 ++++++ package.xml | 6 +++--- php_http.h | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/http_message_object.c b/http_message_object.c index b7d8261..0856aef 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -150,7 +150,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type #define http_message_object_write_prop _http_message_object_write_prop static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC); #define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr -static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC); +static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC); #define http_message_object_get_props _http_message_object_get_props static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); @@ -564,7 +564,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC) freeObject(o); } -static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) { +static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC) { getObjectEx(http_message_object, obj, object); http_message_object_prophandler *handler; @@ -573,7 +573,7 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_ return NULL; } - return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC); + return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_GET_PPTR_TYPE_CC ZEND_LITERAL_KEY_CC TSRMLS_CC); } static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC) diff --git a/missing.h b/missing.h index 6afa3ac..0186ea5 100644 --- a/missing.h +++ b/missing.h @@ -22,6 +22,10 @@ #endif #if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399) +# if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500) +# define ZEND_GET_PPTR_TYPE_DC , int type +# define ZEND_GET_PPTR_TYPE_CC , type +#endif # define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key # define ZEND_LITERAL_KEY_CC , _zend_literal_key # define ZEND_LITERAL_NIL_CC , NULL @@ -42,6 +46,8 @@ } #else +# define ZEND_GET_PPTR_TYPE_DC +# define ZEND_GET_PPTR_TYPE_CC # define ZEND_LITERAL_KEY_DC # define ZEND_LITERAL_KEY_CC # define ZEND_LITERAL_NIL_CC diff --git a/package.xml b/package.xml index 70b255c..93c94b6 100644 --- a/package.xml +++ b/package.xml @@ -28,9 +28,9 @@ support. Parallel requests are available for PHP 5 and greater. mike@php.net yes - 2013-03-03 + 2013-03-08 - 1.7.5 + 1.7.6dev 1.7.0 @@ -39,7 +39,7 @@ support. Parallel requests are available for PHP 5 and greater. BSD, revised diff --git a/php_http.h b/php_http.h index 60c88cf..b682983 100644 --- a/php_http.h +++ b/php_http.h @@ -15,7 +15,7 @@ #ifndef PHP_EXT_HTTP_H #define PHP_EXT_HTTP_H -#define PHP_HTTP_VERSION "1.7.5" +#define PHP_HTTP_VERSION "1.7.6dev" #ifdef HAVE_CONFIG_H # include "config.h" -- 2.30.2