summaryrefslogtreecommitdiffstats
path: root/56.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-10-06 09:34:40 +0200
committerRemi Collet <remi@remirepo.net>2020-10-06 09:34:40 +0200
commit4316e3e952caa03bf5aa901f0e24b23c3059d095 (patch)
tree61e802fb8c4946355a1fa9eae8af22e572d18880 /56.patch
parent3fa9618e426d97f0607dd466ab6aabdad7bdee15 (diff)
add patch for PHP 8 from
https://github.com/DomBlack/php-scrypt/pull/56
Diffstat (limited to '56.patch')
-rw-r--r--56.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/56.patch b/56.patch
new file mode 100644
index 0000000..a5e1ea6
--- /dev/null
+++ b/56.patch
@@ -0,0 +1,49 @@
+From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 22 Sep 2020 14:55:32 +0200
+Subject: [PATCH] trivial fix for PHP 8
+
+---
+ crypto/crypto_scrypt-sse.c | 1 +
+ php_scrypt.h | 5 +++++
+ php_scrypt_utils.c | 1 +
+ 3 files changed, 7 insertions(+)
+
+diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c
+index a52ce81..709a04f 100644
+--- a/crypto/crypto_scrypt-sse.c
++++ b/crypto/crypto_scrypt-sse.c
+@@ -44,6 +44,7 @@
+ #include "sysendian.h"
+
+ #include "crypto_scrypt.h"
++#include "php_scrypt.h"
+
+ static void blkcpy(void *, void *, size_t);
+ static void blkxor(void *, void *, size_t);
+diff --git a/php_scrypt.h b/php_scrypt.h
+index a1117c8..6cc1c4c 100644
+--- a/php_scrypt.h
++++ b/php_scrypt.h
+@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams);
+ extern zend_module_entry scrypt_module_entry;
+ #define phpext_scrypt_ptr &scrypt_module_entry
+
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#define TSRMLS_FETCH()
++#endif
++
+ #endif
+diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c
+index 797e2c7..34fe347 100644
+--- a/php_scrypt_utils.c
++++ b/php_scrypt_utils.c
+@@ -25,6 +25,7 @@
+ */
+
+ #include "php_scrypt_utils.h"
++#include "php_scrypt.h"
+
+ /*
+ * Casts a long into a uint64_t.