X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=bindings%2Fperl-shared%2FRRDs.xs;h=830a779d5f0f090c395cfeed3c0a445aa0b8b4f2;hp=e15aaec13d719beb57877ef51c59e304f3da2d69;hb=b0a526a0bcba4a883645db7c228f905c3906be77;hpb=4dbd51c362841d00433c95c9b671e818ec2d6df3;ds=sidebyside diff --git a/bindings/perl-shared/RRDs.xs b/bindings/perl-shared/RRDs.xs index e15aaec..830a779 100644 --- a/bindings/perl-shared/RRDs.xs +++ b/bindings/perl-shared/RRDs.xs @@ -24,18 +24,14 @@ extern "C" { */ #define VERSION_SAVED VERSION #undef VERSION +#ifndef WIN32 #include "../../rrd_config.h" +#endif #include "../../src/rrd_tool.h" #undef VERSION #define VERSION VERSION_SAVED #undef VERSION_SAVED -/* perl 5.004 compatibility */ -#if PERLPATCHLEVEL < 5 -#define PL_sv_undef sv_undef -#endif - - #define rrdcode(name) \ argv = (char **) malloc((items+1)*sizeof(char *));\ argv[0] = "dummy";\ @@ -85,7 +81,7 @@ extern "C" { switch (data->type) { \ case RD_I_VAL: \ if (isnan(data->value.u_val)) \ - hvs(&PL_sv_undef); \ + hvs(newSV(0)); \ else \ hvs(newSVnv(data->value.u_val)); \ break; \ @@ -126,7 +122,6 @@ BOOT: #ifdef MUST_DISABLE_FPMASK fpsetmask(0); #endif - SV* rrd_error() @@ -136,7 +131,6 @@ rrd_error() OUTPUT: RETVAL - int rrd_last(...) PROTOTYPE: @ @@ -159,7 +153,6 @@ rrd_first(...) OUTPUT: RETVAL - int rrd_create(...) PROTOTYPE: @ @@ -172,7 +165,6 @@ rrd_create(...) OUTPUT: RETVAL - int rrd_update(...) PROTOTYPE: @ @@ -185,7 +177,6 @@ rrd_update(...) OUTPUT: RETVAL - int rrd_tune(...) PROTOTYPE: @ @@ -198,7 +189,6 @@ rrd_tune(...) OUTPUT: RETVAL - SV * rrd_graph(...) PROTOTYPE: @ @@ -286,7 +276,7 @@ rrd_fetch(...) for (i = start+step; i <= end; i += step){ line = newAV(); for (ii = 0; ii < ds_cnt; ii++){ - av_push(line,(isnan(*datai) ? &PL_sv_undef : newSVnv(*datai))); + av_push(line,(isnan(*datai) ? newSV(0) : newSVnv(*datai))); datai++; } av_push(retar,newRV_noinc((SV*)line)); @@ -366,7 +356,7 @@ rrd_xport(...) for (i = start+step; i <= end; i += step){ line = newAV(); for (ii = 0; ii < col_cnt; ii++){ - av_push(line,(isnan(*ptr) ? &PL_sv_undef : newSVnv(*ptr))); + av_push(line,(isnan(*ptr) ? newSV(0) : newSVnv(*ptr))); ptr++; } av_push(retar,newRV_noinc((SV*)line)); @@ -444,6 +434,7 @@ rrd_restore(...) OUTPUT: RETVAL +#ifndef WIN32 int rrd_flushcached(...) PROTOTYPE: @ @@ -451,6 +442,8 @@ rrd_flushcached(...) int i; char **argv; CODE: - rrdcode(rrd_cmd_flush); + rrdcode(rrd_flushcached); OUTPUT: RETVAL + +#endif