From c942d819fdb44e046ef6416573e82d5fbf937c90 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Apr 2013 19:59:45 +0200 Subject: php-pecl-http1: fix php 5.5 patch to work with php 5.4 --- http-php55.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'http-php55.patch') diff --git a/http-php55.patch b/http-php55.patch index e58aef7..306eada 100644 --- a/http-php55.patch +++ b/http-php55.patch @@ -49,3 +49,36 @@ # define ZEND_LITERAL_KEY_DC # define ZEND_LITERAL_KEY_CC # define ZEND_LITERAL_NIL_CC +Index: missing.h +=================================================================== +--- pecl/http/trunk/missing.h (révision 330132) ++++ pecl/http/trunk/missing.h (copie de travail) +@@ -21,11 +21,15 @@ + #define ZEND_ENGINE_2_4 + #endif + ++#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50500) ++# define ZEND_GET_PPTR_TYPE_DC , int type ++# define ZEND_GET_PPTR_TYPE_CC , type ++#else ++# define ZEND_GET_PPTR_TYPE_DC ++# define ZEND_GET_PPTR_TYPE_CC ++#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 +@@ -46,8 +50,6 @@ + } + + #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 -- cgit