svn commit: r554220 - head/devel/pecl-expect/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Nov  6 11:22:04 2020
New Revision: 554220
URL: https://svnweb.freebsd.org/changeset/ports/554220

Log:
  Fix build with PHP 8.0

Added:
  head/devel/pecl-expect/files/patch-expect_fopen_wrapper.c   (contents, props changed)
Modified:
  head/devel/pecl-expect/files/patch-expect.c

Modified: head/devel/pecl-expect/files/patch-expect.c
==============================================================================
--- head/devel/pecl-expect/files/patch-expect.c	Fri Nov  6 11:21:58 2020	(r554219)
+++ head/devel/pecl-expect/files/patch-expect.c	Fri Nov  6 11:22:04 2020	(r554220)
@@ -1,6 +1,17 @@
 --- expect.c.orig	2020-01-13 18:27:49 UTC
 +++ expect.c
-@@ -314,7 +314,7 @@ PHP_FUNCTION(expect_expectl)
+@@ -22,6 +22,10 @@
+ #include <string.h>
+ #include <errno.h>
+ 
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_CC
++#endif
++
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_expect_popen, 0, 0, 1)
+ 	ZEND_ARG_INFO(0, command)
+ ZEND_END_ARG_INFO()
+@@ -314,7 +318,7 @@ PHP_FUNCTION(expect_expectl)
  #endif
  	php_stream *stream;
  	int fd, argc;

Added: head/devel/pecl-expect/files/patch-expect_fopen_wrapper.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-expect/files/patch-expect_fopen_wrapper.c	Fri Nov  6 11:22:04 2020	(r554220)
@@ -0,0 +1,13 @@
+--- expect_fopen_wrapper.c.orig	2020-01-13 18:27:49 UTC
++++ expect_fopen_wrapper.c
+@@ -23,6 +23,10 @@
+ #include "php_streams.h"
+ #include <sys/wait.h>
+ 
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_DC
++#endif
++
+ #if PHP_MAJOR_VERSION >= 7
+ php_stream *php_expect_stream_open (php_stream_wrapper *wrapper, const char *command, const char *mode, int options, 
+                            zend_string **opened_command, php_stream_context *context STREAMS_DC TSRMLS_DC)