Attachment 217583 Details for Bug 248961 – fix build with php 7.4

[patch] fix build with php 7.4

pecl-rrd.diff (text/plain), 1.54 KB, created by Renato Botelho on 2020-08-28 12:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Renato Botelho

Created: 2020-08-28 12:10:12 UTC

Size: 1.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 546726)
>+++ Makefile	(working copy)
>@@ -12,6 +12,5 @@
> 
> LIB_DEPENDS=	librrd.so:databases/rrdtool
> USES=		php:pecl localbase pkgconfig
>-IGNORE_WITH_PHP=	74
> 
> .include <bsd.port.mk>
>Index: files/patch-rrd.c
>===================================================================
>--- files/patch-rrd.c	(nonexistent)
>+++ files/patch-rrd.c	(working copy)
>@@ -0,0 +1,25 @@
>+--- rrd.c.orig	2020-08-28 12:06:18 UTC
>++++ rrd.c
>+@@ -55,7 +55,7 @@ PHP_FUNCTION(rrd_fetch)
>+ 	rrd_args *argv;
>+ 	/* returned values if rrd_fetch doesn't fail */
>+ 	time_t start, end;
>+-	ulong step,
>++	u_long step,
>+ 	ds_cnt; /* count of data sources */
>+ 	char **ds_namv; /* list of data source names */
>+ 	rrd_value_t *ds_data; /* all data from all sources */
>+@@ -396,11 +396,11 @@ PHP_FUNCTION(rrd_xport)
>+ 	/* return values from rrd_xport */
>+ 	int xxsize;
>+ 	time_t start, end, time_index;
>+-	ulong step, outvar_count;
>++	u_long step, outvar_count;
>+ 	char **legend_v;
>+ 	rrd_value_t *data, *data_ptr;
>+ 	zval zv_data;
>+-	ulong outvar_index;
>++	u_long outvar_index;
>+ 
>+ 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zv_arr_options) == FAILURE) {
>+ 		return;
>
>Property changes on: files/patch-rrd.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 248961: 217583