From 3f138dac9131271fbb1fc9c282ba866c1dbb1155 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Jan 2022 15:52:12 +0100 Subject: update to 3.0.2 drop patches merged upstream --- memprof-php81.patch | 59 ----------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 memprof-php81.patch (limited to 'memprof-php81.patch') diff --git a/memprof-php81.patch b/memprof-php81.patch deleted file mode 100644 index 46840ec..0000000 --- a/memprof-php81.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9fde6cfe03c96d9f448484aa137901eca2d44d0c Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 2 Jul 2021 14:44:34 +0200 -Subject: [PATCH] fix build with 8.1.0alpha2 - ---- - memprof.c | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/memprof.c b/memprof.c -index a85b5bd..d754838 100644 ---- a/memprof.c -+++ b/memprof.c -@@ -196,15 +196,18 @@ static void (*old_zend_execute)(zend_execute_data *execute_data); - static void (*old_zend_execute_internal)(zend_execute_data *execute_data_ptr, zval *return_value); - #define zend_execute_fn zend_execute_ex - --#if ZEND_MODULE_API_NO < 20170718 /* PHP 7.1 - 7.2 */ -+#if PHP_VERSION_ID < 70200 /* PHP 7.1 */ - static void (*old_zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); - #define MEMPROF_ZEND_ERROR_CB_ARGS_PASSTHRU type, error_filename, error_lineno, format, args --#elif ZEND_MODULE_API_NO < 20200930 /* PHP 7.3 - 7.4 */ -+#elif PHP_VERSION_ID < 80000 /* PHP 7.2 - 7.4 */ - static void (*old_zend_error_cb)(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args); - #define MEMPROF_ZEND_ERROR_CB_ARGS_PASSTHRU type, error_filename, error_lineno, format, args --#else /* PHP 8 */ -+#elif PHP_VERSION_ID < 80100 /* PHP 8.0 */ - static void (*old_zend_error_cb)(int type, const char *error_filename, const uint32_t error_lineno, zend_string *message); - #define MEMPROF_ZEND_ERROR_CB_ARGS_PASSTHRU type, error_filename, error_lineno, message -+#else /* PHP 8.1 */ -+static void (*old_zend_error_cb)(int type, zend_string *error_filename, const uint32_t error_lineno, zend_string *message); -+#define MEMPROF_ZEND_ERROR_CB_ARGS_PASSTHRU type, error_filename, error_lineno, message - #endif - - static PHP_INI_MH((*origOnChangeMemoryLimit)) = NULL; -@@ -764,17 +767,19 @@ static char * generate_filename(const char * format) { - return filename; - } - --#if ZEND_MODULE_API_NO < 20170718 /* PHP 7.1 - 7.2 */ -+#if PHP_VERSION_ID < 70200 /* PHP 7.1 */ - static void memprof_zend_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) --#elif ZEND_MODULE_API_NO < 20200930 /* PHP 7.3 - 7.4 */ -+#elif PHP_VERSION_ID < 80000 /* PHP 7.2 - 7.4 */ - static void memprof_zend_error_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args) --#else /* PHP 8 */ -+#elif PHP_VERSION_ID < 80100 /* PHP 8.0 */ - static void memprof_zend_error_cb(int type, const char *error_filename, const uint32_t error_lineno, zend_string *message) -+#else /* PHP 8.1 */ -+static void memprof_zend_error_cb(int type, zend_string *error_filename, const uint32_t error_lineno, zend_string *message) - #endif - { - char * filename; - php_stream * stream; --#if ZEND_MODULE_API_NO < 20200930 -+#if PHP_VERSION_ID < 80000 - const char * msg = format; - #else - const char * msg = ZSTR_VAL(message); -- cgit