X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=518a5f80f534e0f2d750bc0bb176943f516c2b2e;hp=dbbe0a2b78df9287c143b572c3e94719175cc0ee;hb=dd02a78629d39cbe03a47766755ca935f19df98b;hpb=ebf03950ffaea849b931adf83b6c20ac9fb7ef33

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index dbbe0a2..518a5f8 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -20,16 +20,9 @@
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-#if !HTTP_SHARED_EXT(HASH)
-#	if defined(HTTP_HAVE_EXT_HASH)
-#		include "php_hash.h"
-#	elif defined(HTTP_HAVE_HASH_EXT_HASH)
-#		define HTTP_HAVE_EXT_HASH
-#		include "hash/php_hash.h"
-#	elif defined(HTTP_HAVE_EXT_HASH_EXT_HASH)
-#		define HTTP_HAVE_EXT_HASH
-#		include "ext/hash/php_hash.h"
-#	endif
+
+#ifdef HTTP_HAVE_HASH
+#	include "php_hash.h"
 #endif
 
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
@@ -55,8 +48,8 @@ static inline void *_http_etag_init(TSRMLS_D)
 	void *ctx = NULL;
 	char *mode = HTTP_G->etag.mode;
 	
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-	php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+	const php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
 		ctx = emalloc(eho->context_size);
@@ -81,8 +74,8 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 	unsigned char digest[128] = {0};
 	char *etag = NULL, *mode = HTTP_G->etag.mode;
 	
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-	php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+	const php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
 		eho->hash_final(digest, ctx);
@@ -108,8 +101,8 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC)
 {
 	char *mode = HTTP_G->etag.mode;
-#if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
-	php_hash_ops *eho = NULL;
+#ifdef HTTP_HAVE_HASH
+	const php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
 		eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len);