From: Michael Wallner <mike@php.net>
Date: Sun, 19 Mar 2006 10:28:51 +0000 (+0000)
Subject: - fix builds where include/php/ext/iconv does not have php_have_*.h files
X-Git-Tag: RELEASE_1_0_0RC1~5
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9f74bab2b132b3cf7e4e1460117a50d3345346cf;p=m6w6%2Fext-http

- fix builds where include/php/ext/iconv does not have php_have_*.h files
  by #undef PHP_ATOM_INC
# What is this for actually?
---

diff --git a/http_querystring_object.c b/http_querystring_object.c
index 1238781..6a3f0f3 100644
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -21,8 +21,9 @@
 #include "zend_interfaces.h"
 
 #ifdef HAVE_ICONV
-#	include "ext/standard/url.h"
+#	undef PHP_ATOM_INC
 #	include "ext/iconv/php_iconv.h"
+#	include "ext/standard/url.h"
 #endif
 
 #include "php_http_api.h"
diff --git a/package2.xml b/package2.xml
index 407d42c..c2eda4e 100644
--- a/package2.xml
+++ b/package2.xml
@@ -48,6 +48,7 @@ HttpResponse
  <notes><![CDATA[
 * Fixed possible crash in HttpQueryString if the SAPI does not have a treat_data function registered.
 * Fixed http_build_str() to urlencode brackets ("[]").
+* Fixed builds where include/php/ext/iconv does not have php_have_*.h files
 * Fixed PHP-4 build.
 ]]></notes>
  <contents>