X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_cache_api.h;h=4f067f5a0c72c5fcb8936faa3e80f3f3a52b95f8;hp=f92e30aac7c13075341afe95b59eb3a9fdaf8441;hb=07af5d267afdfdaa2b7e9c29174364bf313634ef;hpb=ab58ba30b72ffb197f5f2429540380cd96e2d315

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index f92e30a..4f067f5 100644
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -28,7 +28,7 @@
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 #	include <mhash.h>
 #endif
 
@@ -40,7 +40,7 @@ typedef enum {
 	HTTP_ETAG_MHASH = 0,
 } http_etag_mode;
 
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 static void *http_etag_alloc_mhash_digest(size_t size)
 {
 	return emalloc(size);
@@ -78,13 +78,13 @@ static inline void *_http_etag_init(TSRMLS_D)
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
 			PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 			if ((mode < 0) || ((ulong)mode > mhash_count()) || (!(ctx = mhash_init(mode)))) {
 				http_error_ex(HE_ERROR, HTTP_E_RUNTIME, "Invalid ETag mode: %ld", mode);
@@ -112,7 +112,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
 			PHP_MD5Final(digest, ctx);
@@ -120,7 +120,7 @@ static inline char *_http_etag_finish(void *ctx TSRMLS_DC)
 			efree(ctx);
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 		{
 			unsigned char *mhash_digest = mhash_end_m(ctx, http_etag_alloc_mhash_digest);
@@ -140,17 +140,17 @@ static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t dat
 	switch (INI_INT("http.etag_mode"))
 	{
 		case HTTP_ETAG_SHA1:
-			PHP_SHA1Update(ctx, data_ptr, data_len);
+			PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len);
 		break;
 		
 		case HTTP_ETAG_MD5:
-#ifndef HAVE_LIBMHASH
+#ifndef HTTP_HAVE_MHASH
 		default:
 #endif
-			PHP_MD5Update(ctx, data_ptr, data_len);
+			PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len);
 		break;
 		
-#ifdef HAVE_LIBMHASH
+#ifdef HTTP_HAVE_MHASH
 		default:
 			mhash(ctx, data_ptr, data_len);
 		break;