Merge branch 'PHP-7.4' into PHP-8.0

krakjoe · krakjoe · commit 33a93b5ed7f0 · 2021-05-11T11:10:52.000+02:00
* PHP-7.4:
  missing ;
diff --git a/sapi/fpm/fpm/events/port.c b/sapi/fpm/fpm/events/port.c
@@ -112,7 +112,7 @@ static int fpm_event_port_clean() /* {{{ */
  */
 static int fpm_event_port_wait(struct fpm_event_queue_s *queue, unsigned long int timeout) /* {{{ */
 {
-	int ret
+	int ret;
 	unsigned int i, nget;
 	timespec_t t;
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static int fpm_event_port_clean() /* {{{ */`
`112`	`112`	`*/`
`113`	`113`	`static int fpm_event_port_wait(struct fpm_event_queue_s queue, unsigned long int timeout) / {{{ */`
`114`	`114`	`{`
`115`		`- int ret`
	`115`	`+ int ret;`
`116`	`116`	`unsigned int i, nget;`
`117`	`117`	`timespec_t t;`
`118`	`118`