From 899070863d2100b83017f7737021774e5202356b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Boldt?= Date: Tue, 27 Mar 2018 10:07:21 +0200 Subject: [PATCH] Moving function mapscript_create_legend Fixing error "undefined symbol: mapscript_create_legend" in PHP7 --- mapscript/php/legend.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mapscript/php/legend.c b/mapscript/php/legend.c index 29e080df75..742cc0c008 100644 --- a/mapscript/php/legend.c +++ b/mapscript/php/legend.c @@ -220,6 +220,17 @@ zend_function_entry legend_functions[] = { } }; +void mapscript_create_legend(legendObj *legend, parent_object parent, zval *return_value TSRMLS_DC) +{ + php_legend_object * php_legend; + object_init_ex(return_value, mapscript_ce_legend); + php_legend = MAPSCRIPT_OBJ_P(php_legend_object, return_value); + php_legend->legend = legend; + + php_legend->parent = parent; + MAPSCRIPT_ADDREF(parent.val); +} + #if PHP_VERSION_ID >= 70000 /* PHP7 - Modification by Bjoern Boldt */ @@ -276,17 +287,6 @@ PHP_MINIT_FUNCTION(legend) } #else /* PHP5 */ -void mapscript_create_legend(legendObj *legend, parent_object parent, zval *return_value TSRMLS_DC) -{ - php_legend_object * php_legend; - object_init_ex(return_value, mapscript_ce_legend); - php_legend = MAPSCRIPT_OBJ_P(php_legend_object, return_value); - php_legend->legend = legend; - - php_legend->parent = parent; - MAPSCRIPT_ADDREF(parent.val); -} - static void mapscript_legend_object_destroy(void *object TSRMLS_DC) { php_legend_object *php_legend = (php_legend_object *)object;