X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=dc9b515bd6897f4dde680a1dc31d07850164347a;hp=3c2e7834321ff727d8952c33f57fdf002b520342;hb=84a00407857506ab8cfb9335cbe5f495a68e0880;hpb=0b27b9ab76c8bac959dd946a7e9ccbc55e170e4c

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 3c2e783..dc9b515 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -21,11 +21,8 @@
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
 
-#if defined(HTTP_HAVE_PHP_HASH_H) && HTTP_HAVE_EXT(HASH)
-#	define HTTP_HAVE_EXT_HASH 1
+#ifdef HTTP_HAVE_HASH
 #	include "php_hash.h"
-#else
-#	define HTTP_HAVE_EXT_HASH 0
 #endif
 
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
@@ -51,7 +48,7 @@ static inline void *_http_etag_init(TSRMLS_D)
 	void *ctx = NULL;
 	char *mode = HTTP_G->etag.mode;
 	
-#if HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
 	php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -77,7 +74,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 	unsigned char digest[128] = {0};
 	char *etag = NULL, *mode = HTTP_G->etag.mode;
 	
-#if HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
 	php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -104,7 +101,7 @@ 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 HTTP_HAVE_EXT_HASH
+#ifdef HTTP_HAVE_HASH
 	php_hash_ops *eho = NULL;
 	
 	if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {