PHP7.4 compatibility - 2 (swoole#2506).

twose · twose · commit f2bbcad75ba4 · 2019-04-16T16:58:11.000+08:00
diff --git a/swoole_trace.c b/swoole_trace.c
@@ -199,15 +199,15 @@ static int trace_dump(swWorker *worker, FILE *slowlog)
                     return -__LINE__;
                 }
 
-#if PHP_VERSION_ID < 80000
+#if PHP_VERSION_ID < 70400
                 if (ZEND_CALL_KIND_EX((*call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_TOP_CODE)
 #else
                 if (ZEND_CALL_KIND_EX(*call_info) == ZEND_CALL_TOP_CODE)
 #endif
                 {
                     return 0;
                 }
-#if PHP_VERSION_ID < 80000
+#if PHP_VERSION_ID < 70400
                 else if (ZEND_CALL_KIND_EX(*(call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_NESTED_CODE)
 #else
                 else if (ZEND_CALL_KIND_EX(*call_info) == ZEND_CALL_NESTED_CODE)

Original file line number	Diff line number	Diff line change
`@@ -199,15 +199,15 @@ static int trace_dump(swWorker worker, FILE slowlog)`
`199`	`199`	`return -__LINE__;`
`200`	`200`	`}`
`201`	`201`
`202`		`-#if PHP_VERSION_ID < 80000`
	`202`	`+#if PHP_VERSION_ID < 70400`
`203`	`203`	`if (ZEND_CALL_KIND_EX((*call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_TOP_CODE)`
`204`	`204`	`#else`
`205`	`205`	`if (ZEND_CALL_KIND_EX(*call_info) == ZEND_CALL_TOP_CODE)`
`206`	`206`	`#endif`
`207`	`207`	`{`
`208`	`208`	`return 0;`
`209`	`209`	`}`
`210`		`-#if PHP_VERSION_ID < 80000`
	`210`	`+#if PHP_VERSION_ID < 70400`
`211`	`211`	`else if (ZEND_CALL_KIND_EX(*(call_info) >> ZEND_CALL_INFO_SHIFT) == ZEND_CALL_NESTED_CODE)`
`212`	`212`	`#else`
`213`	`213`	`else if (ZEND_CALL_KIND_EX(*call_info) == ZEND_CALL_NESTED_CODE)`