From: Frank M. Kromann <fmk@php.net>
Date: Wed, 4 Aug 2004 16:47:17 +0000 (+0000)
Subject: Move iconv exports to the iconv extension and make libxml depend on iconv
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c412842d9feb7d6c3a0f05da3f3628714d6a5a3;p=php

Move iconv exports to the iconv extension and make libxml depend on iconv
---

diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index 2edd6aad85..711e456f43 100644
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -15,6 +15,7 @@ if (PHP_LIBXML == "yes") {
 		if (!PHP_LIBXML_SHARED) {
 			ADD_DEF_FILE("ext\\libxml\\php_libxml2.def");
 		}
+		ADD_EXTENSION_DEP('libxml', 'iconv');
 	}
 }
 
diff --git a/ext/libxml/php_libxml2.def b/ext/libxml/php_libxml2.def
index 60cdb5f55e..0dd470afce 100644
--- a/ext/libxml/php_libxml2.def
+++ b/ext/libxml/php_libxml2.def
@@ -1569,8 +1569,3 @@ xmlTextWriterWritePI
 xmlTextWriterWriteRaw
 xmlTextWriterWriteRawLen
 xmlTextWriterWriteString
-_libiconv_version
-libiconv_close
-libiconv
-libiconv_open
-libiconv_set_relocation_prefix