- finish work on encoding api

[m6w6/ext-http] / php_http_cache_api.h

diff --git a/php_http_cache_api.h b/php_http_cache_api.h
index c9344837178bc26266925c7570fe349155aff0e0..ee9e8f831b6304f41874f8684a2baf8cf4150224 100644 (file)
--- a/php_http_cache_api.h
+++ b/php_http_cache_api.h
@@ -15,23 +15,21 @@
 #ifndef PHP_HTTP_CACHE_API_H
 #define PHP_HTTP_CACHE_API_H
 
-#include "zend_ini.h"
+#include "php_http_send_api.h"
 
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
-
-#include "php_http_std_defs.h"
-#include "php_http.h"
-#include "php_http_api.h"
-#include "php_http_send_api.h"
-
-#ifdef HTTP_HAVE_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
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #define http_etag_digest(d, l) _http_etag_digest((d), (l))
 static inline char *_http_etag_digest(const unsigned char *digest, int len)
 {