summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjvoisin2019-10-24 20:51:56 +0200
committerjvoisin2019-10-24 21:15:29 +0200
commit93cc22bfb57fc881889165ead1adc94dda30dfc4 (patch)
tree224245d94fc250be1652ecf95d46dbee1ba5493d /src
parentcb0f3890af39babaed06ca89a0a754e78babe341 (diff)
Improve a bit the compatibility with php8
- Apparently, TSRMLS_C and TSRMLS_FETCH aren't defined anymore, so we have to manually define them to nothing - PHP8 constified a bit some strings, which is great, so we should do the same to avoid warnings
Diffstat (limited to 'src')
-rw-r--r--src/php_snuffleupagus.h4
-rw-r--r--src/sp_sloppy.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index 1c45653..0141a87 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -53,6 +53,10 @@
53#if PHP_VERSION_ID < 70200 53#if PHP_VERSION_ID < 70200
54typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS); 54typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
55#endif 55#endif
56#if PHP_VERSION_ID >= 80000
57#define TSRMLS_FETCH()
58#define TSRMLS_C
59#endif
56 60
57#include "sp_pcre_compat.h" 61#include "sp_pcre_compat.h"
58#include "sp_list.h" 62#include "sp_list.h"
diff --git a/src/sp_sloppy.c b/src/sp_sloppy.c
index 5837783..88052bb 100644
--- a/src/sp_sloppy.c
+++ b/src/sp_sloppy.c
@@ -2,8 +2,13 @@
2 2
3ZEND_API zend_op_array* (*orig_zend_compile_file)(zend_file_handle* file_handle, 3ZEND_API zend_op_array* (*orig_zend_compile_file)(zend_file_handle* file_handle,
4 int type) = NULL; 4 int type) = NULL;
5#if PHP_VERSION_ID >= 80000
6ZEND_API zend_op_array* (*orig_zend_compile_string)(zval* source_string,
7 const char* filename) = NULL;
8#else
5ZEND_API zend_op_array* (*orig_zend_compile_string)(zval* source_string, 9ZEND_API zend_op_array* (*orig_zend_compile_string)(zval* source_string,
6 char* filename) = NULL; 10 char* filename) = NULL;
11#endif
7 12
8static void modify_opcode(zend_op_array* opline) { 13static void modify_opcode(zend_op_array* opline) {
9 if (NULL != opline) { 14 if (NULL != opline) {