diff options
| author | Remi Collet <remi@remirepo.net> | 2019-04-17 09:28:47 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-04-17 09:28:47 +0200 |
| commit | 5f8482e72c0bc0f9bf6f55fe646a888556d1c863 (patch) | |
| tree | 3124e4acd911cc95c20922b670e6ec29881df6e6 /278.patch | |
| parent | e0c59d82c9ec1a1405f86a6799ba31e1bf2c44d3 (diff) | |
- update to 3.4.4RC1
- drop patches merged upstream
Diffstat (limited to '278.patch')
| -rw-r--r-- | 278.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/278.patch b/278.patch deleted file mode 100644 index e93d5d7..0000000 --- a/278.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ecf11a0a76c3dec3be90a556d23c1a7b86f2b346 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 16 Apr 2019 09:19:11 +0200 -Subject: [PATCH] fix NTS build - ---- - imagick_file.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/imagick_file.c b/imagick_file.c -index bfeca079..7d147e4c 100644 ---- a/imagick_file.c -+++ b/imagick_file.c -@@ -162,9 +162,11 @@ int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct - - #ifndef ZEND_ENGINE_3 - #if PHP_VERSION_ID >= 50600 -+#ifdef ZTS - // This suppresses an 'unused parameter' warning. - (void)tsrm_ls; - #endif -+#endif - #endif - - if (type == ImagickReadImage) { |