header cleanups; fix IDE warnings

[m6w6/ext-http] / php_http_api.h

diff --git a/php_http_api.h b/php_http_api.h
index 5cf64c989c89093a845cb81e43d1e04c78cc199c..47b686994070f791a0ef22c081e83a471a2d577d 100644 (file)
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -17,9 +17,14 @@
 #include "config.h"
 #endif
 
-#include <php.h>
 #include <php_config.h>
+#include <php.h>
 #include <SAPI.h>
+
+#include <ext/standard/php_string.h>
+#include <ext/spl/spl_iterators.h>
+#include <ext/date/php_date.h>
+
 #include <zend_interfaces.h>
 
 #if defined(PHP_WIN32)
@@ -61,6 +66,8 @@ typedef int STATUS;
 #define PHP_HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c))
 #define PHP_HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c))
 
+#include "php_http.h"
+
 #include "php_http_buffer.h"
 #include "php_http_strlist.h"
 #include "php_http_misc.h"
@@ -117,6 +124,15 @@ ZEND_EXTERN_MODULE_GLOBALS(php_http);
 #      define PHP_HTTP_G (&php_http_globals)
 #endif
 
+#if PHP_DEBUG
+#      define _DPF_STR 0
+#      define _DPF_IN  1
+#      define _DPF_OUT 2
+extern void _dpf(int type, const char *data, size_t length);
+#else
+#      define _dpf(t,s,l);
+#endif
+
 #endif /* PHP_HTTP_API_H */