cleanups & includes

[m6w6/ext-http] / php_http_querystring.c

diff --git a/php_http_querystring.c b/php_http_querystring.c
index ffa50522e0f4ce07838d5ee4d82e7c374f241622..8b9e2c6e6377ebacb08eebc4c280d50d00ca19da 100644 (file)
--- a/php_http_querystring.c
+++ b/php_http_querystring.c
@@ -14,7 +14,14 @@
 
 #include "php_http.h"
 
-/** API **/
+#include <main/php_variables.h>
+#include <ext/spl/spl_array.h>
+#include <Zend/zend_interfaces.h>
+
+#ifdef PHP_HTTP_HAVE_ICONV
+#      undef PHP_ATOM_INC
+#      include <ext/iconv/php_iconv.h>
+#endif
 
 static inline int php_http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC);
 static inline int php_http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC);
@@ -188,8 +195,6 @@ static inline int php_http_querystring_modify_array_ex(zval *qarray, int key_typ
        return 1;
 }
 
-/** PHP **/
-
 #define PHP_HTTP_BEGIN_ARGS(method, req_args)                  PHP_HTTP_BEGIN_ARGS_EX(HttpQueryString, method, 0, req_args)
 #define PHP_HTTP_EMPTY_ARGS(method)                                            PHP_HTTP_EMPTY_ARGS_EX(HttpQueryString, method, 0)
 #define PHP_HTTP_QUERYSTRING_ME(method, visibility)            PHP_ME(HttpQueryString, method, PHP_HTTP_ARGS(HttpQueryString, method), visibility)