diff options
author | Remi Collet <fedora@famillecollet.com> | 2016-01-02 08:15:38 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2016-01-02 08:15:38 +0100 |
commit | 7dd284f004799416bba010ff9f20094f1c5d05cc (patch) | |
tree | 4673a41af422e3a4e3a5750c2117a966cf35f0e4 /env-pr4.patch | |
parent | 4711391e366f20176b2d4c36b9e32f4548c18678 (diff) |
php-pecl-env: 0.2.1 (beta)
Diffstat (limited to 'env-pr4.patch')
-rw-r--r-- | env-pr4.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/env-pr4.patch b/env-pr4.patch new file mode 100644 index 0000000..5cafd6a --- /dev/null +++ b/env-pr4.patch @@ -0,0 +1,32 @@ +From b12ee80b2198c8964b72790fe27b2754c7e86708 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Sat, 2 Jan 2016 07:55:43 +0100 +Subject: [PATCH] fix PHP 7 dtor, fix #3 + +--- + env.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/env.c b/env.c +index 075139e..9263445 100644 +--- a/env.c ++++ b/env.c +@@ -41,18 +41,10 @@ PHP_INI_END() + /* }}} */ + + +-#if PHP_VERSION_ID < 70000 + void char_ptr_dtor(char **str) + { + free(*str); + } +-#else +-void char_ptr_dtor(zval **str) +-{ +- free(Z_STRVAL_PP(str)); +- free(*str); +-} +-#endif + + /* {{{ PHP_GINIT_FUNCTION + */ |