Skip to content

Commit

Permalink
databases/pecl-rrd: Fix build with PHP 7.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
rbgarga committed Aug 25, 2020
1 parent ea2b477 commit 2e64348
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
1 change: 0 additions & 1 deletion databases/pecl-rrd/Makefile
Expand Up @@ -12,6 +12,5 @@ LICENSE= PHP301

LIB_DEPENDS= librrd.so:databases/rrdtool
USES= php:pecl localbase pkgconfig
IGNORE_WITH_PHP= 74

.include <bsd.port.mk>
25 changes: 25 additions & 0 deletions databases/pecl-rrd/files/patch-rrd.c
@@ -0,0 +1,25 @@
--- rrd.c.orig 2020-08-25 17:13:01 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;

0 comments on commit 2e64348

Please sign in to comment.