diff options
| author | Remi Collet <remi@remirepo.net> | 2020-05-31 07:59:22 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-05-31 07:59:22 +0200 |
| commit | d46ba64e1acd03746b91d1d05a6216fa803ecf32 (patch) | |
| tree | d63f7a06c0f8b0df7abc1dd636db489d0edea812 /0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch | |
| parent | 60b25188efaf2ae2b8d240b94148c52985b6ec27 (diff) | |
update to 1.18.0
drop patches merged upstream
Diffstat (limited to '0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch')
| -rw-r--r-- | 0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch b/0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch deleted file mode 100644 index 430ad21..0000000 --- a/0002-define-TSRMLS_-macro-dropped-in-PHP-8.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3ef107ac8bea3043e493786e2f8ad20366b0ad7d Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 17 Apr 2020 09:16:03 +0200 -Subject: [PATCH 2/2] define TSRMLS_* macro dropped in PHP 8 - ---- - src/nxt_php_sapi.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c -index f505365..b059146 100644 ---- a/src/nxt_php_sapi.c -+++ b/src/nxt_php_sapi.c -@@ -29,6 +29,13 @@ - #define NXT_PHP7 1 - #endif - -+#ifndef TSRMLS_CC -+#define TSRMLS_CC -+#define TSRMLS_DC -+#define TSRMLS_D void -+#define TSRMLS_C -+#endif -+ - typedef struct { - char *cookie; - nxt_str_t path_info; --- -2.25.2 - |