- config.m4 moved to config9.m4

[m6w6/ext-http] / php_http_cache_api.h

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index dbbe0a2b78df9287c143b572c3e94719175cc0ee..5bd727e5faaae7b5c5c1e88b094ed732299ab350 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -20,7 +20,7 @@
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-#if !HTTP_SHARED_EXT(HASH)
+#if HTTP_HAVE_EXT(HASH)
 #      if defined(HTTP_HAVE_EXT_HASH)
 #              include "php_hash.h"
 #      elif defined(HTTP_HAVE_HASH_EXT_HASH)
@@ -55,7 +55,7 @@ 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)
+#if HTTP_HAVE_EXT(HASH)
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -81,7 +81,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 defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
+#if HTTP_HAVE_EXT(HASH)
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -108,7 +108,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 defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
+#if HTTP_HAVE_EXT(HASH)
        php_hash_ops *eho = NULL;
        
        if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {