From 0376c1a449dc981448cef5706fcebb3e0c5b0e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Paw=C5=82ow?= Date: Wed, 14 Sep 2016 17:20:39 +0200 Subject: Revert "Remove useless include and defines." This reverts commit 3b3b3b3a4bdbf6162378e860aff772f1f3604b5c. --- php_imlib.c | 1 + php_imlib.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/php_imlib.c b/php_imlib.c index 8704844..2e387a1 100644 --- a/php_imlib.c +++ b/php_imlib.c @@ -18,6 +18,7 @@ */ #include "php.h" +#include "php_ini.h" #include "php_imlib.h" #include "php_globals.h" #include "php_open_temporary_file.h" diff --git a/php_imlib.h b/php_imlib.h index 30c7e58..7df29c5 100644 --- a/php_imlib.h +++ b/php_imlib.h @@ -158,6 +158,7 @@ typedef PHP_Imlib_Color_Modifier_struct *PHP_Imlib_Color_Modifier; #if PHP_VERSION_ID >= 70000 typedef zval imlib_zval; typedef zend_resource imlib_resource; +# define IMLIB_TO_ZVAL(v) v # define Z_LVAL_PP(v) Z_LVAL_P(v) # define Z_DVAL_PP(v) Z_DVAL_P(v) # define STR_VAL(k) (k)->val @@ -172,6 +173,7 @@ typedef PHP_Imlib_Color_Modifier_struct *PHP_Imlib_Color_Modifier; typedef zval* imlib_zval; typedef imlib_zval imlib_resource; typedef char zend_string; +# define IMLIB_TO_ZVAL(v) *v # define STR_VAL(k) (k) # define IMLIB_DELETE_RESOURCE(v) zend_list_delete(Z_LVAL_PP(v)) # define IMLIB_RETURN_STRING(v) RETURN_STRING(v, 1) -- cgit v1.2.3