X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=linux-gpib-php7.patch;h=0d161b8c02f59696a264826f9e946d665edc0a20;hb=e0e47a04465669972e4b9749957ffe800a7a5259;hp=045fbf0e429dcdf6a804def1c9df0f7b98740f6c;hpb=76a67c9afd5202b3700ef3a5498572e30a85f2d9;p=packages%2Flinux-gpib.git diff --git a/linux-gpib-php7.patch b/linux-gpib-php7.patch index 045fbf0..0d161b8 100644 --- a/linux-gpib-php7.patch +++ b/linux-gpib-php7.patch @@ -24,14 +24,14 @@ #endif @@ -550,7 +558,11 @@ - memset(p,0,len+1); + memset(p,0,len+1); r=ibrd(n,p,len); - p[ibcnt]='\0'; + p[ibcnt]='\0'; +#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(z,p); ++ ZVAL_STRING(z,p); +#else - ZVAL_STRING(z,p,1); + ZVAL_STRING(z,p,1); +#endif - free(p); + efree(p); RETURN_LONG(r); }