X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=8df20a0cce159931d5adf339c643044937c628f4;hp=3c2e7834321ff727d8952c33f57fdf002b520342;hb=refs%2Fheads%2Fv1.7.x;hpb=fb5d0ef47f1f54dad0efa1f091324e3d7d18050b

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index 3c2e783..8df20a0 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -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,8 +48,8 @@ static inline void *_http_etag_init(TSRMLS_D)
 	void *ctx = NULL;
 	char *mode = HTTP_G->etag.mode;
 	
-#if HTTP_HAVE_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);
@@ -77,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 HTTP_HAVE_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);
@@ -104,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 HTTP_HAVE_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);