com php-src: Remove usage of HAVE_HASH_EXT and COMPILE _DL_HASH as ext/hash is always available (mas ter only): ext/hash/config.m4 ext/hash/config.w
32 ext/hash/hash.c ext/phar/phar.c ext/session/ph p_session.h
| From: | Kalle Sommer Nielsen | Date: | Wed, 20 Mar 2019 18:43:35 +0000 |
| Subject: | com php-src: Remove usage of HAVE_HASH_EXT and COMPILE _DL_HASH as ext/hash is always available (mas ter only): ext/hash/config.m4 ext/hash/config.w 32 ext/hash/hash.c ext/phar/phar.c ext/session/ph p_session.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105288@lists.php.net to get a copy of this message | ||
Commit: e632537c83af5186d4cf3f0dacb3102ef850fb88
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 20 Mar 2019 20:43:35 +0200
Parents: 7b2a908c040d016fa03229f39765058a6988ac87
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e632537c83af5186d4cf3f0dacb3102ef850fb88
Log:
Remove usage of HAVE_HASH_EXT and COMPILE_DL_HASH as ext/hash is always available (master only)
Changed paths:
M ext/hash/config.m4
M ext/hash/config.w32
M ext/hash/hash.c
M ext/phar/phar.c
M ext/session/php_session.h
Diff:
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 0158237..fde3586 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -13,8 +13,6 @@ if test "$PHP_MHASH" != "no"; then
AC_DEFINE(PHP_MHASH_BC, 1, [ ])
fi
-AC_DEFINE(HAVE_HASH_EXT,1,[Have HASH Extension])
-
if test $ac_cv_c_bigendian_php = yes; then
EXT_HASH_SHA3_SOURCES="hash_sha3.c"
AC_DEFINE(HAVE_SLOW_HASH3, 1, [Define is hash3 algo is available])
diff --git a/ext/hash/config.w32 b/ext/hash/config.w32
index bb3b339..5d6be6b 100644
--- a/ext/hash/config.w32
+++ b/ext/hash/config.w32
@@ -6,8 +6,6 @@ if (PHP_MHASH != 'no') {
AC_DEFINE('PHP_MHASH_BC', 1);
}
-AC_DEFINE('HAVE_HASH_EXT', 1);
-
PHP_HASH = 'yes';
EXTENSION('hash', 'hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c ' +
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
index 2b6d435..5b0c857 100644
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@@ -1488,7 +1488,3 @@ zend_module_entry hash_module_entry = {
STANDARD_MODULE_PROPERTIES
};
/* }}} */
-
-#ifdef COMPILE_DL_HASH
-ZEND_GET_MODULE(hash)
-#endif
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 7cd33d2..d34e89b 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3615,9 +3615,7 @@ static const zend_module_dep phar_deps[] = {
ZEND_MOD_OPTIONAL("openssl")
ZEND_MOD_OPTIONAL("zlib")
ZEND_MOD_OPTIONAL("standard")
-#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH)
ZEND_MOD_REQUIRED("hash")
-#endif
ZEND_MOD_REQUIRED("spl")
ZEND_MOD_END
};
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index 854110d..4c795fd 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -20,10 +20,7 @@
#define PHP_SESSION_H
#include "ext/standard/php_var.h"
-
-#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
-# include "ext/hash/php_hash.h"
-#endif
+#include "ext/hash/php_hash.h"
#define PHP_SESSION_API 20161017