jbossnative-commits December 2007

jbossnative-commits@lists.jboss.org

2 participants
107 discussions

JBoss Native SVN: r1178 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-12 02:53:08 -0500 (Wed, 12 Dec 2007) New Revision: 1178 Modified: trunk/build/unix/build.sh trunk/build/unix/package.list Log: Add apr-iconv to the core components builds Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-12-12 07:39:05 UTC (rev 1177) +++ trunk/build/unix/build.sh 2007-12-12 07:53:08 UTC (rev 1178) @@ -45,6 +45,7 @@ has_openssl=false has_apr=true has_apu=true +has_api=false has_cache=false has_version=false has_package=false @@ -144,8 +145,9 @@ parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep $build_version` apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'` apu_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'` -ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` -svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $6}'` +api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'` +ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'` +svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $7}'` if [ "x" = "x${ssl_version}" ]; then has_openssl=false @@ -551,6 +553,46 @@ } # +# Build apr-iconv +# $1 directory of the sources directory +# $2 static or shared +buildapi() +{ + api_srcdir=$1 + api_static=$2 + + if $apu_static ; then + api_common_dir=${build_common_dir}-static + else + api_common_dir=${build_common_dir} + fi + + if [ -f ${api_common_dir}/include/apr-1/apr_iconv.h ]; then + echo "Using cached apr-iconv in ${api_common_dir}" + return + fi + echo "Configuring apr-iconv-${api_version} with --prefix=${api_common_dir}" + if $BUILD_WIN ; then + (cd ${api_srcdir} + echo "Building APR iconv ${api_version} ..." + cygwinpath true WITH_APR=${api_common_dir} PREFIX=${api_common_dir} SRCDIR=`pwd` + if $api_static ; then + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install + else + nmake -f NMAKEmakefile $wrapped_args install + fi + ) + else + (cd ${api_srcdir} + ./configure ${add_conf} --with-apr=${api_common_dir} --prefix=${api_common_dir} + echo "Building APR iconv ${api_version} ..." + make + make install + ) + fi +} + +# # Build the binaries # $1 directory where to put the resulting tarball. # XXX: It is always $build_output_dir ! @@ -630,13 +672,17 @@ if $BUILD_WIN ; then APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... APRURLBACK=http://archive.apache.org/dist/apr/apr-${apu_version}-win32-sr... APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}-win... + APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}-wi... else APRURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-${apr_ver... APUURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-util-${ap... + APIURL=http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-iconv-${a... APRURLBACK=http://archive.apache.org/dist/apr/apr-${apr_version}.tar.gz APUURLBACK=http://archive.apache.org/dist/apr/apr-util-${apu_version}.tar.gz + APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta... fi SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz @@ -652,6 +698,9 @@ if $has_apu; then ckeckdownload apr-util-${apu_version} $APUURL $APUURLBACK fi +if $has_api; then + ckeckdownload apr-iconv-${api_version} $APIURL $APIURLBACK +fi # # Get the repository of what we build. @@ -666,7 +715,7 @@ cat > ${package_src_dir}/package.list << EOF # THIS FILE WAS AUTOGENERATED BY `basename $0` # -${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${ssl_version}|${svn_tagname} +${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${svn_tagname} EOF @@ -676,6 +725,9 @@ if $has_apr; then cp ../../srclib/apr/NMAKEmakefile $package_src_dir/srclib/apr-${apr_version}/ fi +if $has_api; then + cp ../../srclib/apr-iconv/NMAKEmakefile $package_src_dir/srclib/apr-iconv-${api_version}/ +fi if $has_apu; then cp ../../srclib/apr-util/NMAKEmakefile $package_src_dir/srclib/apr-util-${apu_version}/ fi Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2007-12-12 07:39:05 UTC (rev 1177) +++ trunk/build/unix/package.list 2007-12-12 07:53:08 UTC (rev 1178) @@ -1,13 +1,13 @@ # list of the packages # add new versions of package after existing ones. -jboss-native|2.0.1|1.2.9|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.2|1.2.9|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 -jboss-native|2.0.3-dev|1.2.8|1.2.8|0.9.8e|trunk -jboss-native|2.0.3|1.2.8|1.2.8|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 +jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|trunk +jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11 # SIGHT -jboss-sight|1.0.0|1.2.9|1.2.8||trunk -jboss-sight|1.0.1|1.2.8|1.2.8||trunk -jboss-sight|1.0.2|1.2.8|1.2.8||trunk +jboss-sight|1.0.0|1.2.9|1.2.8|1.2.1||trunk +jboss-sight|1.0.1|1.2.8|1.2.8|1.2.1||trunk +jboss-sight|1.0.2|1.2.8|1.2.8|1.2.1||trunk # httpd -jboss-httpd|0.0.1||||2.2.6 -rhel-httpd|0.0.1||||httpd-2_2_3-11_el5 +jboss-httpd|0.0.1|||||2.2.6 +rhel-httpd|0.0.1|||||httpd-2_2_3-11_el5

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1177 - in trunk: srclib/apr-iconv and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-12 02:39:05 -0500 (Wed, 12 Dec 2007) New Revision: 1177 Added: trunk/build/patch/apr-iconv-1.2.1.patch Removed: trunk/srclib/apr-iconv/apr-iconv-original.patch Log: Use correct location for apr-iconv patch Added: trunk/build/patch/apr-iconv-1.2.1.patch =================================================================== --- trunk/build/patch/apr-iconv-1.2.1.patch (rev 0) +++ trunk/build/patch/apr-iconv-1.2.1.patch 2007-12-12 07:39:05 UTC (rev 1177) @@ -0,0 +1,3389 @@ +Index: ccs/adobe-stdenc.c +=================================================================== +--- ccs/adobe-stdenc.c (revision 603239) ++++ ccs/adobe-stdenc.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_stdenc) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/adobe-symbol.c +=================================================================== +--- ccs/adobe-symbol.c (revision 603239) ++++ ccs/adobe-symbol.c (working copy) +@@ -479,7 +479,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_symbol)= { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/adobe-zdingbats.c +=================================================================== +--- ccs/adobe-zdingbats.c (revision 603239) ++++ ccs/adobe-zdingbats.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_zdingbats) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/big5.c +=================================================================== +--- ccs/big5.c (revision 603239) ++++ ccs/big5.c (working copy) +@@ -6674,7 +6674,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(big5) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane1.c +=================================================================== +--- ccs/cns11643-plane1.c (revision 603239) ++++ ccs/cns11643-plane1.c (working copy) +@@ -4708,7 +4708,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane14.c +=================================================================== +--- ccs/cns11643-plane14.c (revision 603239) ++++ ccs/cns11643-plane14.c (working copy) +@@ -4297,7 +4297,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane2.c +=================================================================== +--- ccs/cns11643-plane2.c (revision 603239) ++++ ccs/cns11643-plane2.c (working copy) +@@ -4506,7 +4506,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp037.c +=================================================================== +--- ccs/cp037.c (revision 603239) ++++ ccs/cp037.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp037) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp038.c +=================================================================== +--- ccs/cp038.c (revision 603239) ++++ ccs/cp038.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp038) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10000.c +=================================================================== +--- ccs/cp10000.c (revision 603239) ++++ ccs/cp10000.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10000) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10006.c +=================================================================== +--- ccs/cp10006.c (revision 603239) ++++ ccs/cp10006.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10006) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10007.c +=================================================================== +--- ccs/cp10007.c (revision 603239) ++++ ccs/cp10007.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10007) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10029.c +=================================================================== +--- ccs/cp10029.c (revision 603239) ++++ ccs/cp10029.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10029) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp1006.c +=================================================================== +--- ccs/cp1006.c (revision 603239) ++++ ccs/cp1006.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp1006) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10079.c +=================================================================== +--- ccs/cp10079.c (revision 603239) ++++ ccs/cp10079.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10079) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10081.c +=================================================================== +--- ccs/cp10081.c (revision 603239) ++++ ccs/cp10081.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10081) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp1026.c +=================================================================== +--- ccs/cp1026.c (revision 603239) ++++ ccs/cp1026.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp1026) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp273.c +=================================================================== +--- ccs/cp273.c (revision 603239) ++++ ccs/cp273.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp273) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp274.c +=================================================================== +--- ccs/cp274.c (revision 603239) ++++ ccs/cp274.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp274) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp275.c +=================================================================== +--- ccs/cp275.c (revision 603239) ++++ ccs/cp275.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp275) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp277.c +=================================================================== +--- ccs/cp277.c (revision 603239) ++++ ccs/cp277.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp277) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp278.c +=================================================================== +--- ccs/cp278.c (revision 603239) ++++ ccs/cp278.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp278) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp280.c +=================================================================== +--- ccs/cp280.c (revision 603239) ++++ ccs/cp280.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp280) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp281.c +=================================================================== +--- ccs/cp281.c (revision 603239) ++++ ccs/cp281.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp281) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp284.c +=================================================================== +--- ccs/cp284.c (revision 603239) ++++ ccs/cp284.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp284) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp285.c +=================================================================== +--- ccs/cp285.c (revision 603239) ++++ ccs/cp285.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp285) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp290.c +=================================================================== +--- ccs/cp290.c (revision 603239) ++++ ccs/cp290.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp290) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp297.c +=================================================================== +--- ccs/cp297.c (revision 603239) ++++ ccs/cp297.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp297) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp420.c +=================================================================== +--- ccs/cp420.c (revision 603239) ++++ ccs/cp420.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp420) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp423.c +=================================================================== +--- ccs/cp423.c (revision 603239) ++++ ccs/cp423.c (working copy) +@@ -221,7 +221,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp423) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp424.c +=================================================================== +--- ccs/cp424.c (revision 603239) ++++ ccs/cp424.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp424) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp437.c +=================================================================== +--- ccs/cp437.c (revision 603239) ++++ ccs/cp437.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp437) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp500.c +=================================================================== +--- ccs/cp500.c (revision 603239) ++++ ccs/cp500.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp500) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp737.c +=================================================================== +--- ccs/cp737.c (revision 603239) ++++ ccs/cp737.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp737) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp775.c +=================================================================== +--- ccs/cp775.c (revision 603239) ++++ ccs/cp775.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp775) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp850.c +=================================================================== +--- ccs/cp850.c (revision 603239) ++++ ccs/cp850.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp850) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp851.c +=================================================================== +--- ccs/cp851.c (revision 603239) ++++ ccs/cp851.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp851) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp852.c +=================================================================== +--- ccs/cp852.c (revision 603239) ++++ ccs/cp852.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp852) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp855.c +=================================================================== +--- ccs/cp855.c (revision 603239) ++++ ccs/cp855.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp855) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp856.c +=================================================================== +--- ccs/cp856.c (revision 603239) ++++ ccs/cp856.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp856) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp857.c +=================================================================== +--- ccs/cp857.c (revision 603239) ++++ ccs/cp857.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp857) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp860.c +=================================================================== +--- ccs/cp860.c (revision 603239) ++++ ccs/cp860.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp860) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp861.c +=================================================================== +--- ccs/cp861.c (revision 603239) ++++ ccs/cp861.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp861) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp862.c +=================================================================== +--- ccs/cp862.c (revision 603239) ++++ ccs/cp862.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp862) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp863.c +=================================================================== +--- ccs/cp863.c (revision 603239) ++++ ccs/cp863.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp863) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp864.c +=================================================================== +--- ccs/cp864.c (revision 603239) ++++ ccs/cp864.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp864) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp865.c +=================================================================== +--- ccs/cp865.c (revision 603239) ++++ ccs/cp865.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp865) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp866.c +=================================================================== +--- ccs/cp866.c (revision 603239) ++++ ccs/cp866.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp866) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp868.c +=================================================================== +--- ccs/cp868.c (revision 603239) ++++ ccs/cp868.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp868) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp869.c +=================================================================== +--- ccs/cp869.c (revision 603239) ++++ ccs/cp869.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp869) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp870.c +=================================================================== +--- ccs/cp870.c (revision 603239) ++++ ccs/cp870.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp870) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp871.c +=================================================================== +--- ccs/cp871.c (revision 603239) ++++ ccs/cp871.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp871) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp874.c +=================================================================== +--- ccs/cp874.c (revision 603239) ++++ ccs/cp874.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp874) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp875.c +=================================================================== +--- ccs/cp875.c (revision 603239) ++++ ccs/cp875.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp875) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp880.c +=================================================================== +--- ccs/cp880.c (revision 603239) ++++ ccs/cp880.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp880) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp891.c +=================================================================== +--- ccs/cp891.c (revision 603239) ++++ ccs/cp891.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp891) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp903.c +=================================================================== +--- ccs/cp903.c (revision 603239) ++++ ccs/cp903.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp903) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp904.c +=================================================================== +--- ccs/cp904.c (revision 603239) ++++ ccs/cp904.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp904) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp905.c +=================================================================== +--- ccs/cp905.c (revision 603239) ++++ ccs/cp905.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp905) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp918.c +=================================================================== +--- ccs/cp918.c (revision 603239) ++++ ccs/cp918.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp918) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp932.c +=================================================================== +--- ccs/cp932.c (revision 603239) ++++ ccs/cp932.c (working copy) +@@ -5134,7 +5134,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp932) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp936.c +=================================================================== +--- ccs/cp936.c (revision 603239) ++++ ccs/cp936.c (working copy) +@@ -8109,7 +8109,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp936) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp949.c +=================================================================== +--- ccs/cp949.c (revision 603239) ++++ ccs/cp949.c (working copy) +@@ -9544,7 +9544,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp949) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp950.c +=================================================================== +--- ccs/cp950.c (revision 603239) ++++ ccs/cp950.c (working copy) +@@ -6569,7 +6569,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp950) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/dec-mcs.c +=================================================================== +--- ccs/dec-mcs.c (revision 603239) ++++ ccs/dec-mcs.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(dec_mcs) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-at-de-a.c +=================================================================== +--- ccs/ebcdic-at-de-a.c (revision 603239) ++++ ccs/ebcdic-at-de-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_at_de_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-at-de.c +=================================================================== +--- ccs/ebcdic-at-de.c (revision 603239) ++++ ccs/ebcdic-at-de.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_at_de) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-ca-fr.c +=================================================================== +--- ccs/ebcdic-ca-fr.c (revision 603239) ++++ ccs/ebcdic-ca-fr.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_ca_fr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-dk-no-a.c +=================================================================== +--- ccs/ebcdic-dk-no-a.c (revision 603239) ++++ ccs/ebcdic-dk-no-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_dk_no_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-dk-no.c +=================================================================== +--- ccs/ebcdic-dk-no.c (revision 603239) ++++ ccs/ebcdic-dk-no.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_dk_no) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es-a.c +=================================================================== +--- ccs/ebcdic-es-a.c (revision 603239) ++++ ccs/ebcdic-es-a.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es-s.c +=================================================================== +--- ccs/ebcdic-es-s.c (revision 603239) ++++ ccs/ebcdic-es-s.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es_s) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es.c +=================================================================== +--- ccs/ebcdic-es.c (revision 603239) ++++ ccs/ebcdic-es.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fi-se-a.c +=================================================================== +--- ccs/ebcdic-fi-se-a.c (revision 603239) ++++ ccs/ebcdic-fi-se-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fi_se_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fi-se.c +=================================================================== +--- ccs/ebcdic-fi-se.c (revision 603239) ++++ ccs/ebcdic-fi-se.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fi_se) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fr.c +=================================================================== +--- ccs/ebcdic-fr.c (revision 603239) ++++ ccs/ebcdic-fr.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-it.c +=================================================================== +--- ccs/ebcdic-it.c (revision 603239) ++++ ccs/ebcdic-it.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_it) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-pt.c +=================================================================== +--- ccs/ebcdic-pt.c (revision 603239) ++++ ccs/ebcdic-pt.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_pt) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-uk.c +=================================================================== +--- ccs/ebcdic-uk.c (revision 603239) ++++ ccs/ebcdic-uk.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_uk) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-us.c +=================================================================== +--- ccs/ebcdic-us.c (revision 603239) ++++ ccs/ebcdic-us.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_us) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/gb12345.c +=================================================================== +--- ccs/gb12345.c (revision 603239) ++++ ccs/gb12345.c (working copy) +@@ -5085,7 +5085,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb12345) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/gb_2312-80.c +=================================================================== +--- ccs/gb_2312-80.c (revision 603239) ++++ ccs/gb_2312-80.c (working copy) +@@ -5012,7 +5012,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb_2312_80) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/hp-roman8.c +=================================================================== +--- ccs/hp-roman8.c (revision 603239) ++++ ccs/hp-roman8.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(hp_roman8) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-1.c +=================================================================== +--- ccs/iso-8859-1.c (revision 603239) ++++ ccs/iso-8859-1.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-10.c +=================================================================== +--- ccs/iso-8859-10.c (revision 603239) ++++ ccs/iso-8859-10.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_10) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-13.c +=================================================================== +--- ccs/iso-8859-13.c (revision 603239) ++++ ccs/iso-8859-13.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_13) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-14.c +=================================================================== +--- ccs/iso-8859-14.c (revision 603239) ++++ ccs/iso-8859-14.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-15.c +=================================================================== +--- ccs/iso-8859-15.c (revision 603239) ++++ ccs/iso-8859-15.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-2.c +=================================================================== +--- ccs/iso-8859-2.c (revision 603239) ++++ ccs/iso-8859-2.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-3.c +=================================================================== +--- ccs/iso-8859-3.c (revision 603239) ++++ ccs/iso-8859-3.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_3) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-4.c +=================================================================== +--- ccs/iso-8859-4.c (revision 603239) ++++ ccs/iso-8859-4.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_4) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-5.c +=================================================================== +--- ccs/iso-8859-5.c (revision 603239) ++++ ccs/iso-8859-5.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_5) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-6.c +=================================================================== +--- ccs/iso-8859-6.c (revision 603239) ++++ ccs/iso-8859-6.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_6) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-7.c +=================================================================== +--- ccs/iso-8859-7.c (revision 603239) ++++ ccs/iso-8859-7.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_7) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-8.c +=================================================================== +--- ccs/iso-8859-8.c (revision 603239) ++++ ccs/iso-8859-8.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_8) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-9.c +=================================================================== +--- ccs/iso-8859-9.c (revision 603239) ++++ ccs/iso-8859-9.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_9) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-10.c +=================================================================== +--- ccs/iso-ir-10.c (revision 603239) ++++ ccs/iso-ir-10.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_10) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-102.c +=================================================================== +--- ccs/iso-ir-102.c (revision 603239) ++++ ccs/iso-ir-102.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_102) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-103.c +=================================================================== +--- ccs/iso-ir-103.c (revision 603239) ++++ ccs/iso-ir-103.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_103) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-11.c +=================================================================== +--- ccs/iso-ir-11.c (revision 603239) ++++ ccs/iso-ir-11.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_11) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-111.c +=================================================================== +--- ccs/iso-ir-111.c (revision 603239) ++++ ccs/iso-ir-111.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_111) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-121.c +=================================================================== +--- ccs/iso-ir-121.c (revision 603239) ++++ ccs/iso-ir-121.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_121) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-122.c +=================================================================== +--- ccs/iso-ir-122.c (revision 603239) ++++ ccs/iso-ir-122.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_122) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-123.c +=================================================================== +--- ccs/iso-ir-123.c (revision 603239) ++++ ccs/iso-ir-123.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_123) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-128.c +=================================================================== +--- ccs/iso-ir-128.c (revision 603239) ++++ ccs/iso-ir-128.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_128) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-13.c +=================================================================== +--- ccs/iso-ir-13.c (revision 603239) ++++ ccs/iso-ir-13.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_13) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-139.c +=================================================================== +--- ccs/iso-ir-139.c (revision 603239) ++++ ccs/iso-ir-139.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_139) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-14.c +=================================================================== +--- ccs/iso-ir-14.c (revision 603239) ++++ ccs/iso-ir-14.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-141.c +=================================================================== +--- ccs/iso-ir-141.c (revision 603239) ++++ ccs/iso-ir-141.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_141) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-142.c +=================================================================== +--- ccs/iso-ir-142.c (revision 603239) ++++ ccs/iso-ir-142.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_142) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-143.c +=================================================================== +--- ccs/iso-ir-143.c (revision 603239) ++++ ccs/iso-ir-143.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_143) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-146.c +=================================================================== +--- ccs/iso-ir-146.c (revision 603239) ++++ ccs/iso-ir-146.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_146) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-147.c +=================================================================== +--- ccs/iso-ir-147.c (revision 603239) ++++ ccs/iso-ir-147.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_147) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-15.c +=================================================================== +--- ccs/iso-ir-15.c (revision 603239) ++++ ccs/iso-ir-15.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-150.c +=================================================================== +--- ccs/iso-ir-150.c (revision 603239) ++++ ccs/iso-ir-150.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_150) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-151.c +=================================================================== +--- ccs/iso-ir-151.c (revision 603239) ++++ ccs/iso-ir-151.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_151) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-152.c +=================================================================== +--- ccs/iso-ir-152.c (revision 603239) ++++ ccs/iso-ir-152.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_152) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-153.c +=================================================================== +--- ccs/iso-ir-153.c (revision 603239) ++++ ccs/iso-ir-153.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_153) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-154.c +=================================================================== +--- ccs/iso-ir-154.c (revision 603239) ++++ ccs/iso-ir-154.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_154) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-155.c +=================================================================== +--- ccs/iso-ir-155.c (revision 603239) ++++ ccs/iso-ir-155.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_155) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-158.c +=================================================================== +--- ccs/iso-ir-158.c (revision 603239) ++++ ccs/iso-ir-158.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_158) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-16.c +=================================================================== +--- ccs/iso-ir-16.c (revision 603239) ++++ ccs/iso-ir-16.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_16) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-17.c +=================================================================== +--- ccs/iso-ir-17.c (revision 603239) ++++ ccs/iso-ir-17.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_17) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-18.c +=================================================================== +--- ccs/iso-ir-18.c (revision 603239) ++++ ccs/iso-ir-18.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_18) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-19.c +=================================================================== +--- ccs/iso-ir-19.c (revision 603239) ++++ ccs/iso-ir-19.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_19) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-2.c +=================================================================== +--- ccs/iso-ir-2.c (revision 603239) ++++ ccs/iso-ir-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-21.c +=================================================================== +--- ccs/iso-ir-21.c (revision 603239) ++++ ccs/iso-ir-21.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_21) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-25.c +=================================================================== +--- ccs/iso-ir-25.c (revision 603239) ++++ ccs/iso-ir-25.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_25) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-27.c +=================================================================== +--- ccs/iso-ir-27.c (revision 603239) ++++ ccs/iso-ir-27.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_27) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-37.c +=================================================================== +--- ccs/iso-ir-37.c (revision 603239) ++++ ccs/iso-ir-37.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_37) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-4.c +=================================================================== +--- ccs/iso-ir-4.c (revision 603239) ++++ ccs/iso-ir-4.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_4) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-47.c +=================================================================== +--- ccs/iso-ir-47.c (revision 603239) ++++ ccs/iso-ir-47.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_47) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-49.c +=================================================================== +--- ccs/iso-ir-49.c (revision 603239) ++++ ccs/iso-ir-49.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_49) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-50.c +=================================================================== +--- ccs/iso-ir-50.c (revision 603239) ++++ ccs/iso-ir-50.c (working copy) +@@ -288,7 +288,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_50) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-51.c +=================================================================== +--- ccs/iso-ir-51.c (revision 603239) ++++ ccs/iso-ir-51.c (working copy) +@@ -288,7 +288,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_51) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-54.c +=================================================================== +--- ccs/iso-ir-54.c (revision 603239) ++++ ccs/iso-ir-54.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_54) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-55.c +=================================================================== +--- ccs/iso-ir-55.c (revision 603239) ++++ ccs/iso-ir-55.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_55) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-57.c +=================================================================== +--- ccs/iso-ir-57.c (revision 603239) ++++ ccs/iso-ir-57.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_57) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-60.c +=================================================================== +--- ccs/iso-ir-60.c (revision 603239) ++++ ccs/iso-ir-60.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_60) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-61.c +=================================================================== +--- ccs/iso-ir-61.c (revision 603239) ++++ ccs/iso-ir-61.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_61) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-69.c +=================================================================== +--- ccs/iso-ir-69.c (revision 603239) ++++ ccs/iso-ir-69.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_69) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-70.c +=================================================================== +--- ccs/iso-ir-70.c (revision 603239) ++++ ccs/iso-ir-70.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_70) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-8-1.c +=================================================================== +--- ccs/iso-ir-8-1.c (revision 603239) ++++ ccs/iso-ir-8-1.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_8_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-8-2.c +=================================================================== +--- ccs/iso-ir-8-2.c (revision 603239) ++++ ccs/iso-ir-8-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_8_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-84.c +=================================================================== +--- ccs/iso-ir-84.c (revision 603239) ++++ ccs/iso-ir-84.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_84) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-85.c +=================================================================== +--- ccs/iso-ir-85.c (revision 603239) ++++ ccs/iso-ir-85.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_85) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-86.c +=================================================================== +--- ccs/iso-ir-86.c (revision 603239) ++++ ccs/iso-ir-86.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_86) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-88.c +=================================================================== +--- ccs/iso-ir-88.c (revision 603239) ++++ ccs/iso-ir-88.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_88) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-89.c +=================================================================== +--- ccs/iso-ir-89.c (revision 603239) ++++ ccs/iso-ir-89.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_89) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-9-1.c +=================================================================== +--- ccs/iso-ir-9-1.c (revision 603239) ++++ ccs/iso-ir-9-1.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_9_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-9-2.c +=================================================================== +--- ccs/iso-ir-9-2.c (revision 603239) ++++ ccs/iso-ir-9-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_9_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-90.c +=================================================================== +--- ccs/iso-ir-90.c (revision 603239) ++++ ccs/iso-ir-90.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_90) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-91.c +=================================================================== +--- ccs/iso-ir-91.c (revision 603239) ++++ ccs/iso-ir-91.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_91) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-92.c +=================================================================== +--- ccs/iso-ir-92.c (revision 603239) ++++ ccs/iso-ir-92.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_92) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-93.c +=================================================================== +--- ccs/iso-ir-93.c (revision 603239) ++++ ccs/iso-ir-93.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_93) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-94.c +=================================================================== +--- ccs/iso-ir-94.c (revision 603239) ++++ ccs/iso-ir-94.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_94) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-95.c +=================================================================== +--- ccs/iso-ir-95.c (revision 603239) ++++ ccs/iso-ir-95.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_95) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-96.c +=================================================================== +--- ccs/iso-ir-96.c (revision 603239) ++++ ccs/iso-ir-96.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_96) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-98.c +=================================================================== +--- ccs/iso-ir-98.c (revision 603239) ++++ ccs/iso-ir-98.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_98) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-99.c +=================================================================== +--- ccs/iso-ir-99.c (revision 603239) ++++ ccs/iso-ir-99.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_99) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso646-dk.c +=================================================================== +--- ccs/iso646-dk.c (revision 603239) ++++ ccs/iso646-dk.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso646_dk) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso646-kr.c +=================================================================== +--- ccs/iso646-kr.c (revision 603239) ++++ ccs/iso646-kr.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso646_kr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0201.c +=================================================================== +--- ccs/jis_x0201.c (revision 603239) ++++ ccs/jis_x0201.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0201) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0208-1983.c +=================================================================== +--- ccs/jis_x0208-1983.c (revision 603239) ++++ ccs/jis_x0208-1983.c (working copy) +@@ -4796,7 +4796,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0208_1983) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0212-1990.c +=================================================================== +--- ccs/jis_x0212-1990.c (revision 603239) ++++ ccs/jis_x0212-1990.c (working copy) +@@ -4450,7 +4450,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0212_1990) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/johab.c +=================================================================== +--- ccs/johab.c (revision 603239) ++++ ccs/johab.c (working copy) +@@ -9124,7 +9124,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(johab) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-r.c +=================================================================== +--- ccs/koi8-r.c (revision 603239) ++++ ccs/koi8-r.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_r) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-ru.c +=================================================================== +--- ccs/koi8-ru.c (revision 603239) ++++ ccs/koi8-ru.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_ru) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-u.c +=================================================================== +--- ccs/koi8-u.c (revision 603239) ++++ ccs/koi8-u.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_u) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ksx1001.c +=================================================================== +--- ccs/ksx1001.c (revision 603239) ++++ ccs/ksx1001.c (working copy) +@@ -6844,7 +6844,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ksx1001) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-ce.c +=================================================================== +--- ccs/mac-ce.c (revision 603239) ++++ ccs/mac-ce.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_ce) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-croatian.c +=================================================================== +--- ccs/mac-croatian.c (revision 603239) ++++ ccs/mac-croatian.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_croatian) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-cyrillic.c +=================================================================== +--- ccs/mac-cyrillic.c (revision 603239) ++++ ccs/mac-cyrillic.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_cyrillic) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-dingbats.c +=================================================================== +--- ccs/mac-dingbats.c (revision 603239) ++++ ccs/mac-dingbats.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_dingbats) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-greek.c +=================================================================== +--- ccs/mac-greek.c (revision 603239) ++++ ccs/mac-greek.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_greek) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-iceland.c +=================================================================== +--- ccs/mac-iceland.c (revision 603239) ++++ ccs/mac-iceland.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_iceland) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-japan.c +=================================================================== +--- ccs/mac-japan.c (revision 603239) ++++ ccs/mac-japan.c (working copy) +@@ -5169,7 +5169,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_japan) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-roman.c +=================================================================== +--- ccs/mac-roman.c (revision 603239) ++++ ccs/mac-roman.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_roman) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-romania.c +=================================================================== +--- ccs/mac-romania.c (revision 603239) ++++ ccs/mac-romania.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_romania) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-thai.c +=================================================================== +--- ccs/mac-thai.c (revision 603239) ++++ ccs/mac-thai.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_thai) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-turkish.c +=================================================================== +--- ccs/mac-turkish.c (revision 603239) ++++ ccs/mac-turkish.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_turkish) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-ukraine.c +=================================================================== +--- ccs/mac-ukraine.c (revision 603239) ++++ ccs/mac-ukraine.c (working copy) +@@ -78,7 +78,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_ukraine) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/macintosh.c +=================================================================== +--- ccs/macintosh.c (revision 603239) ++++ ccs/macintosh.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(macintosh) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/osd_ebcdic_df04_1.c +=================================================================== +--- ccs/osd_ebcdic_df04_1.c (revision 603239) ++++ ccs/osd_ebcdic_df04_1.c (working copy) +@@ -140,7 +140,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(osd_ebcdic_df04_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/osd_ebcdic_df04_15.c +=================================================================== +--- ccs/osd_ebcdic_df04_15.c (revision 603239) ++++ ccs/osd_ebcdic_df04_15.c (working copy) +@@ -210,7 +210,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(osd_ebcdic_df04_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/shift_jis.c +=================================================================== +--- ccs/shift_jis.c (revision 603239) ++++ ccs/shift_jis.c (working copy) +@@ -4749,7 +4749,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(shift_jis) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/us-ascii.c +=================================================================== +--- ccs/us-ascii.c (revision 603239) ++++ ccs/us-ascii.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(us_ascii) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1250.c +=================================================================== +--- ccs/windows-1250.c (revision 603239) ++++ ccs/windows-1250.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1250) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1251.c +=================================================================== +--- ccs/windows-1251.c (revision 603239) ++++ ccs/windows-1251.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1251) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1252.c +=================================================================== +--- ccs/windows-1252.c (revision 603239) ++++ ccs/windows-1252.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1252) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1253.c +=================================================================== +--- ccs/windows-1253.c (revision 603239) ++++ ccs/windows-1253.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1253) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1254.c +=================================================================== +--- ccs/windows-1254.c (revision 603239) ++++ ccs/windows-1254.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1254) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1255.c +=================================================================== +--- ccs/windows-1255.c (revision 603239) ++++ ccs/windows-1255.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1255) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1256.c +=================================================================== +--- ccs/windows-1256.c (revision 603239) ++++ ccs/windows-1256.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1256) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1257.c +=================================================================== +--- ccs/windows-1257.c (revision 603239) ++++ ccs/windows-1257.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1257) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1258.c +=================================================================== +--- ccs/windows-1258.c (revision 603239) ++++ ccs/windows-1258.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1258) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ces/_tbl_simple.c +=================================================================== +--- ces/_tbl_simple.c (revision 603239) ++++ ces/_tbl_simple.c (working copy) +@@ -176,7 +176,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(_tbl_simple) = { + ICMOD_UC_CES, + table_event, + NULL, +Index: ces/euc-jp.c +=================================================================== +--- ces/euc-jp.c (revision 603239) ++++ ces/euc-jp.c (working copy) +@@ -72,7 +72,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_jp) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/euc-kr.c +=================================================================== +--- ces/euc-kr.c (revision 603239) ++++ ces/euc-kr.c (working copy) +@@ -65,7 +65,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_kr) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/euc-tw.c +=================================================================== +--- ces/euc-tw.c (revision 603239) ++++ ces/euc-tw.c (working copy) +@@ -69,7 +69,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_tw) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/gb2312.c +=================================================================== +--- ces/gb2312.c (revision 603239) ++++ ces/gb2312.c (working copy) +@@ -65,7 +65,7 @@ + apr_iconv_euc_convert_to_ucs + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb2312) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-10646-ucs-2.c +=================================================================== +--- ces/iso-10646-ucs-2.c (revision 603239) ++++ ces/iso-10646-ucs-2.c (working copy) +@@ -30,9 +30,10 @@ + * iconv (Charset Conversion Library) v1.0 + */ + ++#include <stdlib.h> /* free, malloc */ ++ + #define ICONV_INTERNAL + #include "iconv.h" +-#include <stdlib.h> /* free, malloc */ + + static const char * const names[] = { + "iso-10646-ucs-2", "csUnicode", "ucs-2", NULL +@@ -58,7 +59,7 @@ + bytes = *state ? 2 : 4; + if (*outbytesleft < bytes) + return 0; /* No space in the output buffer */ +- if (*state == 0) { ++ if (*state) { + *(*outbuf)++ = 0xFE; + *(*outbuf)++ = 0xFF; + *state = 1; +@@ -125,7 +126,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_10646_ucs_2) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/iso-10646-ucs-4.c +=================================================================== +--- ces/iso-10646-ucs-4.c (revision 603239) ++++ ces/iso-10646-ucs-4.c (working copy) +@@ -30,11 +30,11 @@ + * iconv (Charset Conversion Library) v1.0 + */ + ++#include <stdlib.h> /* free, malloc */ ++ + #define ICONV_INTERNAL + #include "iconv.h" +-#include <stdlib.h> /* free, malloc */ + +- + static const char * const names[] = { + "iso-10646-ucs-2", "ucs-4", "ucs4", NULL + }; +@@ -130,7 +130,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_10646_ucs_4) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/iso-2022-cn.c +=================================================================== +--- ces/iso-2022-cn.c (revision 603239) ++++ ces/iso-2022-cn.c (working copy) +@@ -72,7 +72,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_cn) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-jp-2.c +=================================================================== +--- ces/iso-2022-jp-2.c (revision 603239) ++++ ces/iso-2022-jp-2.c (working copy) +@@ -84,7 +84,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_jp_2) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-jp.c +=================================================================== +--- ces/iso-2022-jp.c (revision 603239) ++++ ces/iso-2022-jp.c (working copy) +@@ -74,7 +74,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_jp) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-kr.c +=================================================================== +--- ces/iso-2022-kr.c (revision 603239) ++++ ces/iso-2022-kr.c (working copy) +@@ -69,7 +69,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_kr) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/ucs2-internal.c +=================================================================== +--- ces/ucs2-internal.c (revision 603239) ++++ ces/ucs2-internal.c (working copy) +@@ -90,7 +90,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ucs2_internal) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/ucs4-internal.c +=================================================================== +--- ces/ucs4-internal.c (revision 603239) ++++ ces/ucs4-internal.c (working copy) +@@ -88,7 +88,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ucs4_internal) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/unicode-1-1-utf-7.c +=================================================================== +--- ces/unicode-1-1-utf-7.c (revision 603239) ++++ ces/unicode-1-1-utf-7.c (working copy) +@@ -295,7 +295,7 @@ + convert_to_ucs, NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(unicode_1_1_utf_7) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/utf-16.c +=================================================================== +--- ces/utf-16.c (revision 603239) ++++ ces/utf-16.c (working copy) +@@ -147,7 +147,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(utf_16) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/utf-8.c +=================================================================== +--- ces/utf-8.c (revision 603239) ++++ ces/utf-8.c (working copy) +@@ -150,7 +150,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(utf_8) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: lib/iconv.h +=================================================================== +--- lib/iconv.h (revision 603239) ++++ lib/iconv.h (working copy) +@@ -130,6 +130,8 @@ + iconv_conv_t * icd_conv; + }; + ++typedef struct iconv_module_desc iconv_module_desc_t; ++ + struct iconv_converter { + struct iconv_converter_desc *ic_desc; + void * ic_data; +@@ -348,7 +350,6 @@ + + extern struct iconv_converter_desc iconv_uc_desc; + +- + API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx); + API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces); + API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); +@@ -360,6 +361,17 @@ + API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); + API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft); + ++#ifdef API_MODULE_STATIC ++#define API_DECLARE_MODULE(M) iconv_module_desc_t M##_iconv_module ++#define API_IMPORT_MODULE(M) extern iconv_module_desc_t M##_iconv_module ++#define API_USE_MODULE(M) 1, &M##_iconv_module ++#else ++#define API_DECLARE_MODULE(M) iconv_module_desc_t iconv_module ++#define API_IMPORT_MODULE(M) ++#define API_USE_MODULE(M) 0, NULL ++ ++#endif ++ + #endif /* ICONV_INTERNAL */ + + #endif /* _ICONV_H_ */ +Index: lib/iconv_module.c +=================================================================== +--- lib/iconv_module.c (revision 603239) ++++ lib/iconv_module.c (working copy) +@@ -52,6 +52,510 @@ + + #define APR_ICONV_PATH "APR_ICONV" API_STRINGIFY(API_MAJOR_VERSION) "_PATH" + ++API_IMPORT_MODULE(_tbl_simple); ++API_IMPORT_MODULE(adobe_stdenc); ++API_IMPORT_MODULE(adobe_symbol); ++API_IMPORT_MODULE(adobe_zdingbats); ++API_IMPORT_MODULE(big5); ++API_IMPORT_MODULE(cns11643_plane1); ++API_IMPORT_MODULE(cns11643_plane14); ++API_IMPORT_MODULE(cns11643_plane2); ++API_IMPORT_MODULE(cp037); ++API_IMPORT_MODULE(cp038); ++API_IMPORT_MODULE(cp10000); ++API_IMPORT_MODULE(cp10006); ++API_IMPORT_MODULE(cp10007); ++API_IMPORT_MODULE(cp10029); ++API_IMPORT_MODULE(cp1006); ++API_IMPORT_MODULE(cp10079); ++API_IMPORT_MODULE(cp10081); ++API_IMPORT_MODULE(cp1026); ++API_IMPORT_MODULE(cp273); ++API_IMPORT_MODULE(cp274); ++API_IMPORT_MODULE(cp275); ++API_IMPORT_MODULE(cp277); ++API_IMPORT_MODULE(cp278); ++API_IMPORT_MODULE(cp280); ++API_IMPORT_MODULE(cp281); ++API_IMPORT_MODULE(cp284); ++API_IMPORT_MODULE(cp285); ++API_IMPORT_MODULE(cp290); ++API_IMPORT_MODULE(cp297); ++API_IMPORT_MODULE(cp420); ++API_IMPORT_MODULE(cp423); ++API_IMPORT_MODULE(cp424); ++API_IMPORT_MODULE(cp437); ++API_IMPORT_MODULE(cp500); ++API_IMPORT_MODULE(cp737); ++API_IMPORT_MODULE(cp775); ++API_IMPORT_MODULE(cp850); ++API_IMPORT_MODULE(cp851); ++API_IMPORT_MODULE(cp852); ++API_IMPORT_MODULE(cp855); ++API_IMPORT_MODULE(cp856); ++API_IMPORT_MODULE(cp857); ++API_IMPORT_MODULE(cp860); ++API_IMPORT_MODULE(cp861); ++API_IMPORT_MODULE(cp862); ++API_IMPORT_MODULE(cp863); ++API_IMPORT_MODULE(cp864); ++API_IMPORT_MODULE(cp865); ++API_IMPORT_MODULE(cp866); ++API_IMPORT_MODULE(cp868); ++API_IMPORT_MODULE(cp869); ++API_IMPORT_MODULE(cp870); ++API_IMPORT_MODULE(cp871); ++API_IMPORT_MODULE(cp874); ++API_IMPORT_MODULE(cp875); ++API_IMPORT_MODULE(cp880); ++API_IMPORT_MODULE(cp891); ++API_IMPORT_MODULE(cp903); ++API_IMPORT_MODULE(cp904); ++API_IMPORT_MODULE(cp905); ++API_IMPORT_MODULE(cp918); ++API_IMPORT_MODULE(cp932); ++API_IMPORT_MODULE(cp936); ++API_IMPORT_MODULE(cp949); ++API_IMPORT_MODULE(cp950); ++API_IMPORT_MODULE(dec_mcs); ++API_IMPORT_MODULE(ebcdic_at_de); ++API_IMPORT_MODULE(ebcdic_at_de_a); ++API_IMPORT_MODULE(ebcdic_ca_fr); ++API_IMPORT_MODULE(ebcdic_dk_no); ++API_IMPORT_MODULE(ebcdic_dk_no_a); ++API_IMPORT_MODULE(ebcdic_es); ++API_IMPORT_MODULE(ebcdic_es_a); ++API_IMPORT_MODULE(ebcdic_es_s); ++API_IMPORT_MODULE(ebcdic_fi_se); ++API_IMPORT_MODULE(ebcdic_fi_se_a); ++API_IMPORT_MODULE(ebcdic_fr); ++API_IMPORT_MODULE(ebcdic_it); ++API_IMPORT_MODULE(ebcdic_pt); ++API_IMPORT_MODULE(ebcdic_uk); ++API_IMPORT_MODULE(ebcdic_us); ++API_IMPORT_MODULE(euc_jp); ++API_IMPORT_MODULE(euc_kr); ++API_IMPORT_MODULE(euc_tw); ++API_IMPORT_MODULE(gb12345); ++API_IMPORT_MODULE(gb2312); ++API_IMPORT_MODULE(gb_2312_80); ++API_IMPORT_MODULE(hp_roman8); ++API_IMPORT_MODULE(iso646_dk); ++API_IMPORT_MODULE(iso646_kr); ++API_IMPORT_MODULE(iso_10646_ucs_2); ++API_IMPORT_MODULE(iso_10646_ucs_4); ++API_IMPORT_MODULE(iso_2022_cn); ++API_IMPORT_MODULE(iso_2022_jp); ++API_IMPORT_MODULE(iso_2022_jp_2); ++API_IMPORT_MODULE(iso_2022_kr); ++API_IMPORT_MODULE(iso_8859_1); ++API_IMPORT_MODULE(iso_8859_10); ++API_IMPORT_MODULE(iso_8859_13); ++API_IMPORT_MODULE(iso_8859_14); ++API_IMPORT_MODULE(iso_8859_15); ++API_IMPORT_MODULE(iso_8859_2); ++API_IMPORT_MODULE(iso_8859_3); ++API_IMPORT_MODULE(iso_8859_4); ++API_IMPORT_MODULE(iso_8859_5); ++API_IMPORT_MODULE(iso_8859_6); ++API_IMPORT_MODULE(iso_8859_7); ++API_IMPORT_MODULE(iso_8859_8); ++API_IMPORT_MODULE(iso_8859_9); ++API_IMPORT_MODULE(iso_ir_10); ++API_IMPORT_MODULE(iso_ir_102); ++API_IMPORT_MODULE(iso_ir_103); ++API_IMPORT_MODULE(iso_ir_11); ++API_IMPORT_MODULE(iso_ir_111); ++API_IMPORT_MODULE(iso_ir_121); ++API_IMPORT_MODULE(iso_ir_122); ++API_IMPORT_MODULE(iso_ir_123); ++API_IMPORT_MODULE(iso_ir_128); ++API_IMPORT_MODULE(iso_ir_13); ++API_IMPORT_MODULE(iso_ir_139); ++API_IMPORT_MODULE(iso_ir_14); ++API_IMPORT_MODULE(iso_ir_141); ++API_IMPORT_MODULE(iso_ir_142); ++API_IMPORT_MODULE(iso_ir_143); ++API_IMPORT_MODULE(iso_ir_146); ++API_IMPORT_MODULE(iso_ir_147); ++API_IMPORT_MODULE(iso_ir_15); ++API_IMPORT_MODULE(iso_ir_150); ++API_IMPORT_MODULE(iso_ir_151); ++API_IMPORT_MODULE(iso_ir_152); ++API_IMPORT_MODULE(iso_ir_153); ++API_IMPORT_MODULE(iso_ir_154); ++API_IMPORT_MODULE(iso_ir_155); ++API_IMPORT_MODULE(iso_ir_158); ++API_IMPORT_MODULE(iso_ir_16); ++API_IMPORT_MODULE(iso_ir_17); ++API_IMPORT_MODULE(iso_ir_18); ++API_IMPORT_MODULE(iso_ir_19); ++API_IMPORT_MODULE(iso_ir_2); ++API_IMPORT_MODULE(iso_ir_21); ++API_IMPORT_MODULE(iso_ir_25); ++API_IMPORT_MODULE(iso_ir_27); ++API_IMPORT_MODULE(iso_ir_37); ++API_IMPORT_MODULE(iso_ir_4); ++API_IMPORT_MODULE(iso_ir_47); ++API_IMPORT_MODULE(iso_ir_49); ++API_IMPORT_MODULE(iso_ir_50); ++API_IMPORT_MODULE(iso_ir_51); ++API_IMPORT_MODULE(iso_ir_54); ++API_IMPORT_MODULE(iso_ir_55); ++API_IMPORT_MODULE(iso_ir_57); ++API_IMPORT_MODULE(iso_ir_60); ++API_IMPORT_MODULE(iso_ir_61); ++API_IMPORT_MODULE(iso_ir_69); ++API_IMPORT_MODULE(iso_ir_70); ++API_IMPORT_MODULE(iso_ir_84); ++API_IMPORT_MODULE(iso_ir_85); ++API_IMPORT_MODULE(iso_ir_86); ++API_IMPORT_MODULE(iso_ir_88); ++API_IMPORT_MODULE(iso_ir_89); ++API_IMPORT_MODULE(iso_ir_8_1); ++API_IMPORT_MODULE(iso_ir_8_2); ++API_IMPORT_MODULE(iso_ir_90); ++API_IMPORT_MODULE(iso_ir_91); ++API_IMPORT_MODULE(iso_ir_92); ++API_IMPORT_MODULE(iso_ir_93); ++API_IMPORT_MODULE(iso_ir_94); ++API_IMPORT_MODULE(iso_ir_95); ++API_IMPORT_MODULE(iso_ir_96); ++API_IMPORT_MODULE(iso_ir_98); ++API_IMPORT_MODULE(iso_ir_99); ++API_IMPORT_MODULE(iso_ir_9_1); ++API_IMPORT_MODULE(iso_ir_9_2); ++API_IMPORT_MODULE(jis_x0201); ++API_IMPORT_MODULE(jis_x0208_1983); ++API_IMPORT_MODULE(jis_x0212_1990); ++API_IMPORT_MODULE(johab); ++API_IMPORT_MODULE(koi8_r); ++API_IMPORT_MODULE(koi8_ru); ++API_IMPORT_MODULE(koi8_u); ++API_IMPORT_MODULE(ksx1001); ++API_IMPORT_MODULE(mac_ce); ++API_IMPORT_MODULE(mac_croatian); ++API_IMPORT_MODULE(mac_cyrillic); ++API_IMPORT_MODULE(mac_dingbats); ++API_IMPORT_MODULE(mac_greek); ++API_IMPORT_MODULE(mac_iceland); ++API_IMPORT_MODULE(mac_japan); ++API_IMPORT_MODULE(mac_roman); ++API_IMPORT_MODULE(mac_romania); ++API_IMPORT_MODULE(mac_thai); ++API_IMPORT_MODULE(mac_turkish); ++API_IMPORT_MODULE(mac_ukraine); ++API_IMPORT_MODULE(macintosh); ++API_IMPORT_MODULE(osd_ebcdic_df04_1); ++API_IMPORT_MODULE(osd_ebcdic_df04_15); ++API_IMPORT_MODULE(shift_jis); ++API_IMPORT_MODULE(ucs2_internal); ++API_IMPORT_MODULE(ucs4_internal); ++API_IMPORT_MODULE(unicode_1_1_utf_7); ++API_IMPORT_MODULE(us_ascii); ++API_IMPORT_MODULE(utf_16); ++API_IMPORT_MODULE(utf_8); ++API_IMPORT_MODULE(windows_1250); ++API_IMPORT_MODULE(windows_1251); ++API_IMPORT_MODULE(windows_1252); ++API_IMPORT_MODULE(windows_1253); ++API_IMPORT_MODULE(windows_1254); ++API_IMPORT_MODULE(windows_1255); ++API_IMPORT_MODULE(windows_1256); ++API_IMPORT_MODULE(windows_1257); ++API_IMPORT_MODULE(windows_1258); ++ ++static struct static_iconv_module { ++ const char *name; ++ int present; ++ iconv_module_desc_t *module; ++} const static_iconv_modules[] = { ++ { "_tbl_simple", API_USE_MODULE(_tbl_simple) }, ++ { "adobe-stdenc", API_USE_MODULE(adobe_stdenc) }, ++ { "adobe-symbol", API_USE_MODULE(adobe_symbol) }, ++ { "adobe-zdingbats", API_USE_MODULE(adobe_zdingbats) }, ++ { "big5", API_USE_MODULE(big5) }, ++ { "cns11643-plane1", API_USE_MODULE(cns11643_plane1) }, ++ { "cns11643-plane14", API_USE_MODULE(cns11643_plane14) }, ++ { "cns11643-plane2", API_USE_MODULE(cns11643_plane2) }, ++ { "cp037", API_USE_MODULE(cp037) }, ++ { "cp038", API_USE_MODULE(cp038) }, ++ { "cp10000", API_USE_MODULE(cp10000) }, ++ { "cp10006", API_USE_MODULE(cp10006) }, ++ { "cp10007", API_USE_MODULE(cp10007) }, ++ { "cp10029", API_USE_MODULE(cp10029) }, ++ { "cp1006", API_USE_MODULE(cp1006) }, ++ { "cp10079", API_USE_MODULE(cp10079) }, ++ { "cp10081", API_USE_MODULE(cp10081) }, ++ { "cp1026", API_USE_MODULE(cp1026) }, ++ { "cp273", API_USE_MODULE(cp273) }, ++ { "cp274", API_USE_MODULE(cp274) }, ++ { "cp275", API_USE_MODULE(cp275) }, ++ { "cp277", API_USE_MODULE(cp277) }, ++ { "cp278", API_USE_MODULE(cp278) }, ++ { "cp280", API_USE_MODULE(cp280) }, ++ { "cp281", API_USE_MODULE(cp281) }, ++ { "cp284", API_USE_MODULE(cp284) }, ++ { "cp285", API_USE_MODULE(cp285) }, ++ { "cp290", API_USE_MODULE(cp290) }, ++ { "cp297", API_USE_MODULE(cp297) }, ++ { "cp420", API_USE_MODULE(cp420) }, ++ { "cp423", API_USE_MODULE(cp423) }, ++ { "cp424", API_USE_MODULE(cp424) }, ++ { "cp437", API_USE_MODULE(cp437) }, ++ { "cp500", API_USE_MODULE(cp500) }, ++ { "cp737", API_USE_MODULE(cp737) }, ++ { "cp775", API_USE_MODULE(cp775) }, ++ { "cp850", API_USE_MODULE(cp850) }, ++ { "cp851", API_USE_MODULE(cp851) }, ++ { "cp852", API_USE_MODULE(cp852) }, ++ { "cp855", API_USE_MODULE(cp855) }, ++ { "cp856", API_USE_MODULE(cp856) }, ++ { "cp857", API_USE_MODULE(cp857) }, ++ { "cp860", API_USE_MODULE(cp860) }, ++ { "cp861", API_USE_MODULE(cp861) }, ++ { "cp862", API_USE_MODULE(cp862) }, ++ { "cp863", API_USE_MODULE(cp863) }, ++ { "cp864", API_USE_MODULE(cp864) }, ++ { "cp865", API_USE_MODULE(cp865) }, ++ { "cp866", API_USE_MODULE(cp866) }, ++ { "cp868", API_USE_MODULE(cp868) }, ++ { "cp869", API_USE_MODULE(cp869) }, ++ { "cp870", API_USE_MODULE(cp870) }, ++ { "cp871", API_USE_MODULE(cp871) }, ++ { "cp874", API_USE_MODULE(cp874) }, ++ { "cp875", API_USE_MODULE(cp875) }, ++ { "cp880", API_USE_MODULE(cp880) }, ++ { "cp891", API_USE_MODULE(cp891) }, ++ { "cp903", API_USE_MODULE(cp903) }, ++ { "cp904", API_USE_MODULE(cp904) }, ++ { "cp905", API_USE_MODULE(cp905) }, ++ { "cp918", API_USE_MODULE(cp918) }, ++ { "cp932", API_USE_MODULE(cp932) }, ++ { "cp936", API_USE_MODULE(cp936) }, ++ { "cp949", API_USE_MODULE(cp949) }, ++ { "cp950", API_USE_MODULE(cp950) }, ++ { "dec-mcs", API_USE_MODULE(dec_mcs) }, ++ { "ebcdic-at-de", API_USE_MODULE(ebcdic_at_de) }, ++ { "ebcdic-at-de-a", API_USE_MODULE(ebcdic_at_de_a) }, ++ { "ebcdic-ca-fr", API_USE_MODULE(ebcdic_ca_fr) }, ++ { "ebcdic-dk-no", API_USE_MODULE(ebcdic_dk_no) }, ++ { "ebcdic-dk-no-a", API_USE_MODULE(ebcdic_dk_no_a) }, ++ { "ebcdic-es", API_USE_MODULE(ebcdic_es) }, ++ { "ebcdic-es-a", API_USE_MODULE(ebcdic_es_a) }, ++ { "ebcdic-es-s", API_USE_MODULE(ebcdic_es_s) }, ++ { "ebcdic-fi-se", API_USE_MODULE(ebcdic_fi_se) }, ++ { "ebcdic-fi-se-a", API_USE_MODULE(ebcdic_fi_se_a) }, ++ { "ebcdic-fr", API_USE_MODULE(ebcdic_fr) }, ++ { "ebcdic-it", API_USE_MODULE(ebcdic_it) }, ++ { "ebcdic-pt", API_USE_MODULE(ebcdic_pt) }, ++ { "ebcdic-uk", API_USE_MODULE(ebcdic_uk) }, ++ { "ebcdic-us", API_USE_MODULE(ebcdic_us) }, ++ { "euc-jp", API_USE_MODULE(euc_jp) }, ++ { "euc-kr", API_USE_MODULE(euc_kr) }, ++ { "euc-tw", API_USE_MODULE(euc_tw) }, ++ { "gb12345", API_USE_MODULE(gb12345) }, ++ { "gb2312", API_USE_MODULE(gb2312) }, ++ { "gb_2312-80", API_USE_MODULE(gb_2312_80) }, ++ { "hp-roman8", API_USE_MODULE(hp_roman8) }, ++ { "iso646-dk", API_USE_MODULE(iso646_dk) }, ++ { "iso646-kr", API_USE_MODULE(iso646_kr) }, ++ { "iso-10646-ucs-2", API_USE_MODULE(iso_10646_ucs_2) }, ++ { "iso-10646-ucs-4", API_USE_MODULE(iso_10646_ucs_4) }, ++ { "iso-2022-cn", API_USE_MODULE(iso_2022_cn) }, ++ { "iso-2022-jp", API_USE_MODULE(iso_2022_jp) }, ++ { "iso-2022-jp-2", API_USE_MODULE(iso_2022_jp_2) }, ++ { "iso-2022-kr", API_USE_MODULE(iso_2022_kr) }, ++ { "iso-8859-1", API_USE_MODULE(iso_8859_1) }, ++ { "iso-8859-10", API_USE_MODULE(iso_8859_10) }, ++ { "iso-8859-13", API_USE_MODULE(iso_8859_13) }, ++ { "iso-8859-14", API_USE_MODULE(iso_8859_14) }, ++ { "iso-8859-15", API_USE_MODULE(iso_8859_15) }, ++ { "iso-8859-2", API_USE_MODULE(iso_8859_2) }, ++ { "iso-8859-3", API_USE_MODULE(iso_8859_3) }, ++ { "iso-8859-4", API_USE_MODULE(iso_8859_4) }, ++ { "iso-8859-5", API_USE_MODULE(iso_8859_5) }, ++ { "iso-8859-6", API_USE_MODULE(iso_8859_6) }, ++ { "iso-8859-7", API_USE_MODULE(iso_8859_7) }, ++ { "iso-8859-8", API_USE_MODULE(iso_8859_8) }, ++ { "iso-8859-9", API_USE_MODULE(iso_8859_9) }, ++ { "iso-ir-10", API_USE_MODULE(iso_ir_10) }, ++ { "iso-ir-102", API_USE_MODULE(iso_ir_102) }, ++ { "iso-ir-103", API_USE_MODULE(iso_ir_103) }, ++ { "iso-ir-11", API_USE_MODULE(iso_ir_11) }, ++ { "iso-ir-111", API_USE_MODULE(iso_ir_111) }, ++ { "iso-ir-121", API_USE_MODULE(iso_ir_121) }, ++ { "iso-ir-122", API_USE_MODULE(iso_ir_122) }, ++ { "iso-ir-123", API_USE_MODULE(iso_ir_123) }, ++ { "iso-ir-128", API_USE_MODULE(iso_ir_128) }, ++ { "iso-ir-13", API_USE_MODULE(iso_ir_13) }, ++ { "iso-ir-139", API_USE_MODULE(iso_ir_139) }, ++ { "iso-ir-14", API_USE_MODULE(iso_ir_14) }, ++ { "iso-ir-141", API_USE_MODULE(iso_ir_141) }, ++ { "iso-ir-142", API_USE_MODULE(iso_ir_142) }, ++ { "iso-ir-143", API_USE_MODULE(iso_ir_143) }, ++ { "iso-ir-146", API_USE_MODULE(iso_ir_146) }, ++ { "iso-ir-147", API_USE_MODULE(iso_ir_147) }, ++ { "iso-ir-15", API_USE_MODULE(iso_ir_15) }, ++ { "iso-ir-150", API_USE_MODULE(iso_ir_150) }, ++ { "iso-ir-151", API_USE_MODULE(iso_ir_151) }, ++ { "iso-ir-152", API_USE_MODULE(iso_ir_152) }, ++ { "iso-ir-153", API_USE_MODULE(iso_ir_153) }, ++ { "iso-ir-154", API_USE_MODULE(iso_ir_154) }, ++ { "iso-ir-155", API_USE_MODULE(iso_ir_155) }, ++ { "iso-ir-158", API_USE_MODULE(iso_ir_158) }, ++ { "iso-ir-16", API_USE_MODULE(iso_ir_16) }, ++ { "iso-ir-17", API_USE_MODULE(iso_ir_17) }, ++ { "iso-ir-18", API_USE_MODULE(iso_ir_18) }, ++ { "iso-ir-19", API_USE_MODULE(iso_ir_19) }, ++ { "iso-ir-2", API_USE_MODULE(iso_ir_2) }, ++ { "iso-ir-21", API_USE_MODULE(iso_ir_21) }, ++ { "iso-ir-25", API_USE_MODULE(iso_ir_25) }, ++ { "iso-ir-27", API_USE_MODULE(iso_ir_27) }, ++ { "iso-ir-37", API_USE_MODULE(iso_ir_37) }, ++ { "iso-ir-4", API_USE_MODULE(iso_ir_4) }, ++ { "iso-ir-47", API_USE_MODULE(iso_ir_47) }, ++ { "iso-ir-49", API_USE_MODULE(iso_ir_49) }, ++ { "iso-ir-50", API_USE_MODULE(iso_ir_50) }, ++ { "iso-ir-51", API_USE_MODULE(iso_ir_51) }, ++ { "iso-ir-54", API_USE_MODULE(iso_ir_54) }, ++ { "iso-ir-55", API_USE_MODULE(iso_ir_55) }, ++ { "iso-ir-57", API_USE_MODULE(iso_ir_57) }, ++ { "iso-ir-60", API_USE_MODULE(iso_ir_60) }, ++ { "iso-ir-61", API_USE_MODULE(iso_ir_61) }, ++ { "iso-ir-69", API_USE_MODULE(iso_ir_69) }, ++ { "iso-ir-70", API_USE_MODULE(iso_ir_70) }, ++ { "iso-ir-84", API_USE_MODULE(iso_ir_84) }, ++ { "iso-ir-85", API_USE_MODULE(iso_ir_85) }, ++ { "iso-ir-86", API_USE_MODULE(iso_ir_86) }, ++ { "iso-ir-88", API_USE_MODULE(iso_ir_88) }, ++ { "iso-ir-89", API_USE_MODULE(iso_ir_89) }, ++ { "iso-ir-8-1", API_USE_MODULE(iso_ir_8_1) }, ++ { "iso-ir-8-2", API_USE_MODULE(iso_ir_8_2) }, ++ { "iso-ir-90", API_USE_MODULE(iso_ir_90) }, ++ { "iso-ir-91", API_USE_MODULE(iso_ir_91) }, ++ { "iso-ir-92", API_USE_MODULE(iso_ir_92) }, ++ { "iso-ir-93", API_USE_MODULE(iso_ir_93) }, ++ { "iso-ir-94", API_USE_MODULE(iso_ir_94) }, ++ { "iso-ir-95", API_USE_MODULE(iso_ir_95) }, ++ { "iso-ir-96", API_USE_MODULE(iso_ir_96) }, ++ { "iso-ir-98", API_USE_MODULE(iso_ir_98) }, ++ { "iso-ir-99", API_USE_MODULE(iso_ir_99) }, ++ { "iso-ir-9-1", API_USE_MODULE(iso_ir_9_1) }, ++ { "iso-ir-9-2", API_USE_MODULE(iso_ir_9_2) }, ++ { "jis_x0201", API_USE_MODULE(jis_x0201) }, ++ { "jis_x0208-1983", API_USE_MODULE(jis_x0208_1983) }, ++ { "jis_x0212-1990", API_USE_MODULE(jis_x0212_1990) }, ++ { "johab", API_USE_MODULE(johab) }, ++ { "koi8-r", API_USE_MODULE(koi8_r) }, ++ { "koi8-ru", API_USE_MODULE(koi8_ru) }, ++ { "koi8-u", API_USE_MODULE(koi8_u) }, ++ { "ksx1001", API_USE_MODULE(ksx1001) }, ++ { "mac-ce", API_USE_MODULE(mac_ce) }, ++ { "mac-croatian", API_USE_MODULE(mac_croatian) }, ++ { "mac-cyrillic", API_USE_MODULE(mac_cyrillic) }, ++ { "mac-dingbats", API_USE_MODULE(mac_dingbats) }, ++ { "mac-greek", API_USE_MODULE(mac_greek) }, ++ { "mac-iceland", API_USE_MODULE(mac_iceland) }, ++ { "mac-japan", API_USE_MODULE(mac_japan) }, ++ { "mac-roman", API_USE_MODULE(mac_roman) }, ++ { "mac-romania", API_USE_MODULE(mac_romania) }, ++ { "mac-thai", API_USE_MODULE(mac_thai) }, ++ { "mac-turkish", API_USE_MODULE(mac_turkish) }, ++ { "mac-ukraine", API_USE_MODULE(mac_ukraine) }, ++ { "macintosh", API_USE_MODULE(macintosh) }, ++ { "osd_ebcdic_df04_1", API_USE_MODULE(osd_ebcdic_df04_1) }, ++ { "osd_ebcdic_df04_15", API_USE_MODULE(osd_ebcdic_df04_15) }, ++ { "shift_jis", API_USE_MODULE(shift_jis) }, ++ { "ucs2-internal", API_USE_MODULE(ucs2_internal) }, ++ { "ucs4-internal", API_USE_MODULE(ucs4_internal) }, ++ { "unicode-1-1-utf-7", API_USE_MODULE(unicode_1_1_utf_7) }, ++ { "us-ascii", API_USE_MODULE(us_ascii) }, ++ { "utf-16", API_USE_MODULE(utf_16) }, ++ { "utf-8", API_USE_MODULE(utf_8) }, ++ { "windows-1250", API_USE_MODULE(windows_1250) }, ++ { "windows-1251", API_USE_MODULE(windows_1251) }, ++ { "windows-1252", API_USE_MODULE(windows_1252) }, ++ { "windows-1253", API_USE_MODULE(windows_1253) }, ++ { "windows-1254", API_USE_MODULE(windows_1254) }, ++ { "windows-1255", API_USE_MODULE(windows_1255) }, ++ { "windows-1256", API_USE_MODULE(windows_1256) }, ++ { "windows-1257", API_USE_MODULE(windows_1257) }, ++ { "windows-1258", API_USE_MODULE(windows_1258) }, ++ ++ { NULL, 0, NULL} ++}; ++ ++static const size_t static_iconv_modules_count = ++ sizeof(static_iconv_modules)/sizeof(static_iconv_modules[0]) - 1; ++ ++ ++/* Compare two static modules. */ ++static int static_iconv_module_compare (const void *u, const void *v) ++{ ++ const struct static_iconv_module *const a = u; ++ const struct static_iconv_module *const b = v; ++ return strcmp(a->name, b->name); ++} ++ ++static iconv_module_desc_t *static_iconv_module_find(const char *name) ++{ ++ struct static_iconv_module key; ++ struct static_iconv_module *val; ++#if 'A' == '\xC1' /* if EBCDIC host */ ++ /* The table is sorted in ASCII collation order, not in EBCDIC order. ++ * At the first access, we sort it automatically ++ * Criterion for the 1st time initialization is the fact that the ++ * 1st name in the list starts with a digit (in ASCII, numbers ++ * have a lower ordinal value than alphabetic characters; while ++ * in EBCDIC, their ordinal value is higher) ++ */ ++ if (isdigit(static_iconv_modules[0].name[0])) { ++ qsort((void *)static_iconv_modules, static_iconv_modules_count, ++ sizeof(static_iconv_modules[0]), ++ static_iconv_module_compare); ++ } ++#endif ++ key.name = name; ++ val = bsearch(&key, static_iconv_modules, static_iconv_modules_count, ++ sizeof(static_iconv_modules[0]), ++ static_iconv_module_compare); ++ if (val) ++ return val->module; ++ else ++ return NULL; ++} ++ ++ ++static int ++iconv_smopen(const char *name, void **dpp) ++{ ++ ++ char buffer[APR_PATH_MAX]; ++ char *ptr; ++ iconv_module_desc_t *module; ++ ++ if (apr_tolower(name[0]) == 'x' && name[1] == '-') ++ name += 2; ++ ptr = buffer; ++ while (0 != (*ptr++ = apr_tolower(*name++))) ++ module = static_iconv_module_find(buffer); ++ if (!module) { ++ const char *alias = charset_alias_find(buffer); ++ if (alias) { ++ if ((module = static_iconv_module_find(alias))) { ++ *dpp = module; ++ return 0; ++ } ++ } ++ } ++ else { ++ *dpp = module; ++ return 0; ++ } ++ return EINVAL; ++} ++ + static apr_status_t + iconv_getpathname(char *buffer, const char *dir, const char *name, apr_pool_t *ctx) + { +@@ -140,6 +644,7 @@ + return EINVAL; + } + ++ + API_DECLARE_NONSTD(int) + apr_iconv_mod_load(const char *modname, int modtype, const void *args, + struct iconv_module **modpp, apr_pool_t *ctx) +@@ -148,22 +653,28 @@ + struct iconv_module *mod, *depmod; + const struct iconv_module_depend *depend; + char buffer[APR_PATH_MAX]; +- void *handle; ++ void *handle = NULL; + int error; ++ ++ /* Try to load the built-in modules first */ ++ error = iconv_smopen(modname, (void**)&mdesc); ++ if (error) { ++ if (iconv_getpath(buffer, modname, ctx) != 0) ++ return EINVAL; + +- if (iconv_getpath(buffer, modname, ctx) != 0) +- return EINVAL; +- +- error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); ++ error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); ++ } + if (error) + return error; + if (modtype != ICMOD_ANY && mdesc->imd_type != modtype) { +- apr_dso_unload(handle); ++ if (handle) ++ apr_dso_unload(handle); + return APR_EFTYPE; + } + mod = malloc(sizeof(*mod)); + if (mod == NULL) { +- apr_dso_unload(handle); ++ if (handle) ++ apr_dso_unload(handle); + return ENOMEM; + } + memset(mod, 0, sizeof(*mod)); Property changes on: trunk/build/patch/apr-iconv-1.2.1.patch ___________________________________________________________________ Name: svn:eol-style + LF Deleted: trunk/srclib/apr-iconv/apr-iconv-original.patch =================================================================== --- trunk/srclib/apr-iconv/apr-iconv-original.patch 2007-12-11 14:40:47 UTC (rev 1176) +++ trunk/srclib/apr-iconv/apr-iconv-original.patch 2007-12-12 07:39:05 UTC (rev 1177) @@ -1,3389 +0,0 @@ -Index: ccs/adobe-stdenc.c -=================================================================== ---- ccs/adobe-stdenc.c (revision 603239) -+++ ccs/adobe-stdenc.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(adobe_stdenc) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/adobe-symbol.c -=================================================================== ---- ccs/adobe-symbol.c (revision 603239) -+++ ccs/adobe-symbol.c (working copy) -@@ -479,7 +479,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(adobe_symbol)= { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/adobe-zdingbats.c -=================================================================== ---- ccs/adobe-zdingbats.c (revision 603239) -+++ ccs/adobe-zdingbats.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(adobe_zdingbats) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/big5.c -=================================================================== ---- ccs/big5.c (revision 603239) -+++ ccs/big5.c (working copy) -@@ -6674,7 +6674,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(big5) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cns11643-plane1.c -=================================================================== ---- ccs/cns11643-plane1.c (revision 603239) -+++ ccs/cns11643-plane1.c (working copy) -@@ -4708,7 +4708,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cns11643_plane1) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cns11643-plane14.c -=================================================================== ---- ccs/cns11643-plane14.c (revision 603239) -+++ ccs/cns11643-plane14.c (working copy) -@@ -4297,7 +4297,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cns11643_plane14) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cns11643-plane2.c -=================================================================== ---- ccs/cns11643-plane2.c (revision 603239) -+++ ccs/cns11643-plane2.c (working copy) -@@ -4506,7 +4506,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cns11643_plane2) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp037.c -=================================================================== ---- ccs/cp037.c (revision 603239) -+++ ccs/cp037.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp037) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp038.c -=================================================================== ---- ccs/cp038.c (revision 603239) -+++ ccs/cp038.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp038) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10000.c -=================================================================== ---- ccs/cp10000.c (revision 603239) -+++ ccs/cp10000.c (working copy) -@@ -409,7 +409,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10000) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10006.c -=================================================================== ---- ccs/cp10006.c (revision 603239) -+++ ccs/cp10006.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10006) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10007.c -=================================================================== ---- ccs/cp10007.c (revision 603239) -+++ ccs/cp10007.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10007) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10029.c -=================================================================== ---- ccs/cp10029.c (revision 603239) -+++ ccs/cp10029.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10029) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp1006.c -=================================================================== ---- ccs/cp1006.c (revision 603239) -+++ ccs/cp1006.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp1006) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10079.c -=================================================================== ---- ccs/cp10079.c (revision 603239) -+++ ccs/cp10079.c (working copy) -@@ -374,7 +374,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10079) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp10081.c -=================================================================== ---- ccs/cp10081.c (revision 603239) -+++ ccs/cp10081.c (working copy) -@@ -374,7 +374,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp10081) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp1026.c -=================================================================== ---- ccs/cp1026.c (revision 603239) -+++ ccs/cp1026.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp1026) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp273.c -=================================================================== ---- ccs/cp273.c (revision 603239) -+++ ccs/cp273.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp273) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp274.c -=================================================================== ---- ccs/cp274.c (revision 603239) -+++ ccs/cp274.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp274) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp275.c -=================================================================== ---- ccs/cp275.c (revision 603239) -+++ ccs/cp275.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp275) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp277.c -=================================================================== ---- ccs/cp277.c (revision 603239) -+++ ccs/cp277.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp277) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp278.c -=================================================================== ---- ccs/cp278.c (revision 603239) -+++ ccs/cp278.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp278) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp280.c -=================================================================== ---- ccs/cp280.c (revision 603239) -+++ ccs/cp280.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp280) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp281.c -=================================================================== ---- ccs/cp281.c (revision 603239) -+++ ccs/cp281.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp281) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp284.c -=================================================================== ---- ccs/cp284.c (revision 603239) -+++ ccs/cp284.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp284) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp285.c -=================================================================== ---- ccs/cp285.c (revision 603239) -+++ ccs/cp285.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp285) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp290.c -=================================================================== ---- ccs/cp290.c (revision 603239) -+++ ccs/cp290.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp290) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp297.c -=================================================================== ---- ccs/cp297.c (revision 603239) -+++ ccs/cp297.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp297) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp420.c -=================================================================== ---- ccs/cp420.c (revision 603239) -+++ ccs/cp420.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp420) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp423.c -=================================================================== ---- ccs/cp423.c (revision 603239) -+++ ccs/cp423.c (working copy) -@@ -221,7 +221,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp423) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp424.c -=================================================================== ---- ccs/cp424.c (revision 603239) -+++ ccs/cp424.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp424) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp437.c -=================================================================== ---- ccs/cp437.c (revision 603239) -+++ ccs/cp437.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp437) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp500.c -=================================================================== ---- ccs/cp500.c (revision 603239) -+++ ccs/cp500.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp500) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp737.c -=================================================================== ---- ccs/cp737.c (revision 603239) -+++ ccs/cp737.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp737) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp775.c -=================================================================== ---- ccs/cp775.c (revision 603239) -+++ ccs/cp775.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp775) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp850.c -=================================================================== ---- ccs/cp850.c (revision 603239) -+++ ccs/cp850.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp850) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp851.c -=================================================================== ---- ccs/cp851.c (revision 603239) -+++ ccs/cp851.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp851) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp852.c -=================================================================== ---- ccs/cp852.c (revision 603239) -+++ ccs/cp852.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp852) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp855.c -=================================================================== ---- ccs/cp855.c (revision 603239) -+++ ccs/cp855.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp855) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp856.c -=================================================================== ---- ccs/cp856.c (revision 603239) -+++ ccs/cp856.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp856) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp857.c -=================================================================== ---- ccs/cp857.c (revision 603239) -+++ ccs/cp857.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp857) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp860.c -=================================================================== ---- ccs/cp860.c (revision 603239) -+++ ccs/cp860.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp860) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp861.c -=================================================================== ---- ccs/cp861.c (revision 603239) -+++ ccs/cp861.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp861) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp862.c -=================================================================== ---- ccs/cp862.c (revision 603239) -+++ ccs/cp862.c (working copy) -@@ -374,7 +374,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp862) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp863.c -=================================================================== ---- ccs/cp863.c (revision 603239) -+++ ccs/cp863.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp863) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp864.c -=================================================================== ---- ccs/cp864.c (revision 603239) -+++ ccs/cp864.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp864) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp865.c -=================================================================== ---- ccs/cp865.c (revision 603239) -+++ ccs/cp865.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp865) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp866.c -=================================================================== ---- ccs/cp866.c (revision 603239) -+++ ccs/cp866.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp866) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp868.c -=================================================================== ---- ccs/cp868.c (revision 603239) -+++ ccs/cp868.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp868) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp869.c -=================================================================== ---- ccs/cp869.c (revision 603239) -+++ ccs/cp869.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp869) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp870.c -=================================================================== ---- ccs/cp870.c (revision 603239) -+++ ccs/cp870.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp870) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp871.c -=================================================================== ---- ccs/cp871.c (revision 603239) -+++ ccs/cp871.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp871) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp874.c -=================================================================== ---- ccs/cp874.c (revision 603239) -+++ ccs/cp874.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp874) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp875.c -=================================================================== ---- ccs/cp875.c (revision 603239) -+++ ccs/cp875.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp875) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp880.c -=================================================================== ---- ccs/cp880.c (revision 603239) -+++ ccs/cp880.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp880) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp891.c -=================================================================== ---- ccs/cp891.c (revision 603239) -+++ ccs/cp891.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp891) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp903.c -=================================================================== ---- ccs/cp903.c (revision 603239) -+++ ccs/cp903.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp903) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp904.c -=================================================================== ---- ccs/cp904.c (revision 603239) -+++ ccs/cp904.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp904) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp905.c -=================================================================== ---- ccs/cp905.c (revision 603239) -+++ ccs/cp905.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp905) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp918.c -=================================================================== ---- ccs/cp918.c (revision 603239) -+++ ccs/cp918.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp918) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp932.c -=================================================================== ---- ccs/cp932.c (revision 603239) -+++ ccs/cp932.c (working copy) -@@ -5134,7 +5134,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp932) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp936.c -=================================================================== ---- ccs/cp936.c (revision 603239) -+++ ccs/cp936.c (working copy) -@@ -8109,7 +8109,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp936) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp949.c -=================================================================== ---- ccs/cp949.c (revision 603239) -+++ ccs/cp949.c (working copy) -@@ -9544,7 +9544,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp949) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/cp950.c -=================================================================== ---- ccs/cp950.c (revision 603239) -+++ ccs/cp950.c (working copy) -@@ -6569,7 +6569,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(cp950) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/dec-mcs.c -=================================================================== ---- ccs/dec-mcs.c (revision 603239) -+++ ccs/dec-mcs.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(dec_mcs) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-at-de-a.c -=================================================================== ---- ccs/ebcdic-at-de-a.c (revision 603239) -+++ ccs/ebcdic-at-de-a.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_at_de_a) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-at-de.c -=================================================================== ---- ccs/ebcdic-at-de.c (revision 603239) -+++ ccs/ebcdic-at-de.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_at_de) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-ca-fr.c -=================================================================== ---- ccs/ebcdic-ca-fr.c (revision 603239) -+++ ccs/ebcdic-ca-fr.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_ca_fr) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-dk-no-a.c -=================================================================== ---- ccs/ebcdic-dk-no-a.c (revision 603239) -+++ ccs/ebcdic-dk-no-a.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_dk_no_a) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-dk-no.c -=================================================================== ---- ccs/ebcdic-dk-no.c (revision 603239) -+++ ccs/ebcdic-dk-no.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_dk_no) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-es-a.c -=================================================================== ---- ccs/ebcdic-es-a.c (revision 603239) -+++ ccs/ebcdic-es-a.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_es_a) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-es-s.c -=================================================================== ---- ccs/ebcdic-es-s.c (revision 603239) -+++ ccs/ebcdic-es-s.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_es_s) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-es.c -=================================================================== ---- ccs/ebcdic-es.c (revision 603239) -+++ ccs/ebcdic-es.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_es) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-fi-se-a.c -=================================================================== ---- ccs/ebcdic-fi-se-a.c (revision 603239) -+++ ccs/ebcdic-fi-se-a.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_fi_se_a) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-fi-se.c -=================================================================== ---- ccs/ebcdic-fi-se.c (revision 603239) -+++ ccs/ebcdic-fi-se.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_fi_se) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-fr.c -=================================================================== ---- ccs/ebcdic-fr.c (revision 603239) -+++ ccs/ebcdic-fr.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_fr) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-it.c -=================================================================== ---- ccs/ebcdic-it.c (revision 603239) -+++ ccs/ebcdic-it.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_it) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-pt.c -=================================================================== ---- ccs/ebcdic-pt.c (revision 603239) -+++ ccs/ebcdic-pt.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_pt) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-uk.c -=================================================================== ---- ccs/ebcdic-uk.c (revision 603239) -+++ ccs/ebcdic-uk.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_uk) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ebcdic-us.c -=================================================================== ---- ccs/ebcdic-us.c (revision 603239) -+++ ccs/ebcdic-us.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ebcdic_us) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/gb12345.c -=================================================================== ---- ccs/gb12345.c (revision 603239) -+++ ccs/gb12345.c (working copy) -@@ -5085,7 +5085,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(gb12345) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/gb_2312-80.c -=================================================================== ---- ccs/gb_2312-80.c (revision 603239) -+++ ccs/gb_2312-80.c (working copy) -@@ -5012,7 +5012,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(gb_2312_80) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/hp-roman8.c -=================================================================== ---- ccs/hp-roman8.c (revision 603239) -+++ ccs/hp-roman8.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(hp_roman8) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-1.c -=================================================================== ---- ccs/iso-8859-1.c (revision 603239) -+++ ccs/iso-8859-1.c (working copy) -@@ -129,7 +129,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_1) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-10.c -=================================================================== ---- ccs/iso-8859-10.c (revision 603239) -+++ ccs/iso-8859-10.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_10) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-13.c -=================================================================== ---- ccs/iso-8859-13.c (revision 603239) -+++ ccs/iso-8859-13.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_13) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-14.c -=================================================================== ---- ccs/iso-8859-14.c (revision 603239) -+++ ccs/iso-8859-14.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_14) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-15.c -=================================================================== ---- ccs/iso-8859-15.c (revision 603239) -+++ ccs/iso-8859-15.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_15) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-2.c -=================================================================== ---- ccs/iso-8859-2.c (revision 603239) -+++ ccs/iso-8859-2.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_2) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-3.c -=================================================================== ---- ccs/iso-8859-3.c (revision 603239) -+++ ccs/iso-8859-3.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_3) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-4.c -=================================================================== ---- ccs/iso-8859-4.c (revision 603239) -+++ ccs/iso-8859-4.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_4) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-5.c -=================================================================== ---- ccs/iso-8859-5.c (revision 603239) -+++ ccs/iso-8859-5.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_5) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-6.c -=================================================================== ---- ccs/iso-8859-6.c (revision 603239) -+++ ccs/iso-8859-6.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_6) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-7.c -=================================================================== ---- ccs/iso-8859-7.c (revision 603239) -+++ ccs/iso-8859-7.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_7) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-8.c -=================================================================== ---- ccs/iso-8859-8.c (revision 603239) -+++ ccs/iso-8859-8.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_8) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-8859-9.c -=================================================================== ---- ccs/iso-8859-9.c (revision 603239) -+++ ccs/iso-8859-9.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_8859_9) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-10.c -=================================================================== ---- ccs/iso-ir-10.c (revision 603239) -+++ ccs/iso-ir-10.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_10) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-102.c -=================================================================== ---- ccs/iso-ir-102.c (revision 603239) -+++ ccs/iso-ir-102.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_102) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-103.c -=================================================================== ---- ccs/iso-ir-103.c (revision 603239) -+++ ccs/iso-ir-103.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_103) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-11.c -=================================================================== ---- ccs/iso-ir-11.c (revision 603239) -+++ ccs/iso-ir-11.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_11) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-111.c -=================================================================== ---- ccs/iso-ir-111.c (revision 603239) -+++ ccs/iso-ir-111.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_111) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-121.c -=================================================================== ---- ccs/iso-ir-121.c (revision 603239) -+++ ccs/iso-ir-121.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_121) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-122.c -=================================================================== ---- ccs/iso-ir-122.c (revision 603239) -+++ ccs/iso-ir-122.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_122) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-123.c -=================================================================== ---- ccs/iso-ir-123.c (revision 603239) -+++ ccs/iso-ir-123.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_123) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-128.c -=================================================================== ---- ccs/iso-ir-128.c (revision 603239) -+++ ccs/iso-ir-128.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_128) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-13.c -=================================================================== ---- ccs/iso-ir-13.c (revision 603239) -+++ ccs/iso-ir-13.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_13) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-139.c -=================================================================== ---- ccs/iso-ir-139.c (revision 603239) -+++ ccs/iso-ir-139.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_139) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-14.c -=================================================================== ---- ccs/iso-ir-14.c (revision 603239) -+++ ccs/iso-ir-14.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_14) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-141.c -=================================================================== ---- ccs/iso-ir-141.c (revision 603239) -+++ ccs/iso-ir-141.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_141) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-142.c -=================================================================== ---- ccs/iso-ir-142.c (revision 603239) -+++ ccs/iso-ir-142.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_142) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-143.c -=================================================================== ---- ccs/iso-ir-143.c (revision 603239) -+++ ccs/iso-ir-143.c (working copy) -@@ -444,7 +444,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_143) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-146.c -=================================================================== ---- ccs/iso-ir-146.c (revision 603239) -+++ ccs/iso-ir-146.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_146) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-147.c -=================================================================== ---- ccs/iso-ir-147.c (revision 603239) -+++ ccs/iso-ir-147.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_147) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-15.c -=================================================================== ---- ccs/iso-ir-15.c (revision 603239) -+++ ccs/iso-ir-15.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_15) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-150.c -=================================================================== ---- ccs/iso-ir-150.c (revision 603239) -+++ ccs/iso-ir-150.c (working copy) -@@ -183,7 +183,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_150) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-151.c -=================================================================== ---- ccs/iso-ir-151.c (revision 603239) -+++ ccs/iso-ir-151.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_151) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-152.c -=================================================================== ---- ccs/iso-ir-152.c (revision 603239) -+++ ccs/iso-ir-152.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_152) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-153.c -=================================================================== ---- ccs/iso-ir-153.c (revision 603239) -+++ ccs/iso-ir-153.c (working copy) -@@ -164,7 +164,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_153) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-154.c -=================================================================== ---- ccs/iso-ir-154.c (revision 603239) -+++ ccs/iso-ir-154.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_154) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-155.c -=================================================================== ---- ccs/iso-ir-155.c (revision 603239) -+++ ccs/iso-ir-155.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_155) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-158.c -=================================================================== ---- ccs/iso-ir-158.c (revision 603239) -+++ ccs/iso-ir-158.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_158) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-16.c -=================================================================== ---- ccs/iso-ir-16.c (revision 603239) -+++ ccs/iso-ir-16.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_16) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-17.c -=================================================================== ---- ccs/iso-ir-17.c (revision 603239) -+++ ccs/iso-ir-17.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_17) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-18.c -=================================================================== ---- ccs/iso-ir-18.c (revision 603239) -+++ ccs/iso-ir-18.c (working copy) -@@ -218,7 +218,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_18) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-19.c -=================================================================== ---- ccs/iso-ir-19.c (revision 603239) -+++ ccs/iso-ir-19.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_19) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-2.c -=================================================================== ---- ccs/iso-ir-2.c (revision 603239) -+++ ccs/iso-ir-2.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_2) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-21.c -=================================================================== ---- ccs/iso-ir-21.c (revision 603239) -+++ ccs/iso-ir-21.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_21) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-25.c -=================================================================== ---- ccs/iso-ir-25.c (revision 603239) -+++ ccs/iso-ir-25.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_25) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-27.c -=================================================================== ---- ccs/iso-ir-27.c (revision 603239) -+++ ccs/iso-ir-27.c (working copy) -@@ -183,7 +183,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_27) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-37.c -=================================================================== ---- ccs/iso-ir-37.c (revision 603239) -+++ ccs/iso-ir-37.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_37) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-4.c -=================================================================== ---- ccs/iso-ir-4.c (revision 603239) -+++ ccs/iso-ir-4.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_4) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-47.c -=================================================================== ---- ccs/iso-ir-47.c (revision 603239) -+++ ccs/iso-ir-47.c (working copy) -@@ -218,7 +218,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_47) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-49.c -=================================================================== ---- ccs/iso-ir-49.c (revision 603239) -+++ ccs/iso-ir-49.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_49) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-50.c -=================================================================== ---- ccs/iso-ir-50.c (revision 603239) -+++ ccs/iso-ir-50.c (working copy) -@@ -288,7 +288,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_50) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-51.c -=================================================================== ---- ccs/iso-ir-51.c (revision 603239) -+++ ccs/iso-ir-51.c (working copy) -@@ -288,7 +288,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_51) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-54.c -=================================================================== ---- ccs/iso-ir-54.c (revision 603239) -+++ ccs/iso-ir-54.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_54) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-55.c -=================================================================== ---- ccs/iso-ir-55.c (revision 603239) -+++ ccs/iso-ir-55.c (working copy) -@@ -218,7 +218,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_55) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-57.c -=================================================================== ---- ccs/iso-ir-57.c (revision 603239) -+++ ccs/iso-ir-57.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_57) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-60.c -=================================================================== ---- ccs/iso-ir-60.c (revision 603239) -+++ ccs/iso-ir-60.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_60) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-61.c -=================================================================== ---- ccs/iso-ir-61.c (revision 603239) -+++ ccs/iso-ir-61.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_61) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-69.c -=================================================================== ---- ccs/iso-ir-69.c (revision 603239) -+++ ccs/iso-ir-69.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_69) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-70.c -=================================================================== ---- ccs/iso-ir-70.c (revision 603239) -+++ ccs/iso-ir-70.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_70) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-8-1.c -=================================================================== ---- ccs/iso-ir-8-1.c (revision 603239) -+++ ccs/iso-ir-8-1.c (working copy) -@@ -218,7 +218,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_8_1) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-8-2.c -=================================================================== ---- ccs/iso-ir-8-2.c (revision 603239) -+++ ccs/iso-ir-8-2.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_8_2) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-84.c -=================================================================== ---- ccs/iso-ir-84.c (revision 603239) -+++ ccs/iso-ir-84.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_84) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-85.c -=================================================================== ---- ccs/iso-ir-85.c (revision 603239) -+++ ccs/iso-ir-85.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_85) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-86.c -=================================================================== ---- ccs/iso-ir-86.c (revision 603239) -+++ ccs/iso-ir-86.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_86) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-88.c -=================================================================== ---- ccs/iso-ir-88.c (revision 603239) -+++ ccs/iso-ir-88.c (working copy) -@@ -183,7 +183,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_88) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-89.c -=================================================================== ---- ccs/iso-ir-89.c (revision 603239) -+++ ccs/iso-ir-89.c (working copy) -@@ -183,7 +183,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_89) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-9-1.c -=================================================================== ---- ccs/iso-ir-9-1.c (revision 603239) -+++ ccs/iso-ir-9-1.c (working copy) -@@ -218,7 +218,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_9_1) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-9-2.c -=================================================================== ---- ccs/iso-ir-9-2.c (revision 603239) -+++ ccs/iso-ir-9-2.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_9_2) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-90.c -=================================================================== ---- ccs/iso-ir-90.c (revision 603239) -+++ ccs/iso-ir-90.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_90) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-91.c -=================================================================== ---- ccs/iso-ir-91.c (revision 603239) -+++ ccs/iso-ir-91.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_91) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-92.c -=================================================================== ---- ccs/iso-ir-92.c (revision 603239) -+++ ccs/iso-ir-92.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_92) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-93.c -=================================================================== ---- ccs/iso-ir-93.c (revision 603239) -+++ ccs/iso-ir-93.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_93) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-94.c -=================================================================== ---- ccs/iso-ir-94.c (revision 603239) -+++ ccs/iso-ir-94.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_94) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-95.c -=================================================================== ---- ccs/iso-ir-95.c (revision 603239) -+++ ccs/iso-ir-95.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_95) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-96.c -=================================================================== ---- ccs/iso-ir-96.c (revision 603239) -+++ ccs/iso-ir-96.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_96) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-98.c -=================================================================== ---- ccs/iso-ir-98.c (revision 603239) -+++ ccs/iso-ir-98.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_98) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso-ir-99.c -=================================================================== ---- ccs/iso-ir-99.c (revision 603239) -+++ ccs/iso-ir-99.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_ir_99) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso646-dk.c -=================================================================== ---- ccs/iso646-dk.c (revision 603239) -+++ ccs/iso646-dk.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso646_dk) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/iso646-kr.c -=================================================================== ---- ccs/iso646-kr.c (revision 603239) -+++ ccs/iso646-kr.c (working copy) -@@ -148,7 +148,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso646_kr) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/jis_x0201.c -=================================================================== ---- ccs/jis_x0201.c (revision 603239) -+++ ccs/jis_x0201.c (working copy) -@@ -199,7 +199,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(jis_x0201) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/jis_x0208-1983.c -=================================================================== ---- ccs/jis_x0208-1983.c (revision 603239) -+++ ccs/jis_x0208-1983.c (working copy) -@@ -4796,7 +4796,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(jis_x0208_1983) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/jis_x0212-1990.c -=================================================================== ---- ccs/jis_x0212-1990.c (revision 603239) -+++ ccs/jis_x0212-1990.c (working copy) -@@ -4450,7 +4450,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(jis_x0212_1990) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/johab.c -=================================================================== ---- ccs/johab.c (revision 603239) -+++ ccs/johab.c (working copy) -@@ -9124,7 +9124,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(johab) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/koi8-r.c -=================================================================== ---- ccs/koi8-r.c (revision 603239) -+++ ccs/koi8-r.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(koi8_r) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/koi8-ru.c -=================================================================== ---- ccs/koi8-ru.c (revision 603239) -+++ ccs/koi8-ru.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(koi8_ru) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/koi8-u.c -=================================================================== ---- ccs/koi8-u.c (revision 603239) -+++ ccs/koi8-u.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(koi8_u) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/ksx1001.c -=================================================================== ---- ccs/ksx1001.c (revision 603239) -+++ ccs/ksx1001.c (working copy) -@@ -6844,7 +6844,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ksx1001) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-ce.c -=================================================================== ---- ccs/mac-ce.c (revision 603239) -+++ ccs/mac-ce.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_ce) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-croatian.c -=================================================================== ---- ccs/mac-croatian.c (revision 603239) -+++ ccs/mac-croatian.c (working copy) -@@ -409,7 +409,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_croatian) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-cyrillic.c -=================================================================== ---- ccs/mac-cyrillic.c (revision 603239) -+++ ccs/mac-cyrillic.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_cyrillic) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-dingbats.c -=================================================================== ---- ccs/mac-dingbats.c (revision 603239) -+++ ccs/mac-dingbats.c (working copy) -@@ -374,7 +374,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_dingbats) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-greek.c -=================================================================== ---- ccs/mac-greek.c (revision 603239) -+++ ccs/mac-greek.c (working copy) -@@ -339,7 +339,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_greek) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-iceland.c -=================================================================== ---- ccs/mac-iceland.c (revision 603239) -+++ ccs/mac-iceland.c (working copy) -@@ -409,7 +409,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_iceland) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-japan.c -=================================================================== ---- ccs/mac-japan.c (revision 603239) -+++ ccs/mac-japan.c (working copy) -@@ -5169,7 +5169,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_japan) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-roman.c -=================================================================== ---- ccs/mac-roman.c (revision 603239) -+++ ccs/mac-roman.c (working copy) -@@ -444,7 +444,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_roman) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-romania.c -=================================================================== ---- ccs/mac-romania.c (revision 603239) -+++ ccs/mac-romania.c (working copy) -@@ -409,7 +409,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_romania) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-thai.c -=================================================================== ---- ccs/mac-thai.c (revision 603239) -+++ ccs/mac-thai.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_thai) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-turkish.c -=================================================================== ---- ccs/mac-turkish.c (revision 603239) -+++ ccs/mac-turkish.c (working copy) -@@ -409,7 +409,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_turkish) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/mac-ukraine.c -=================================================================== ---- ccs/mac-ukraine.c (revision 603239) -+++ ccs/mac-ukraine.c (working copy) -@@ -78,7 +78,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(mac_ukraine) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/macintosh.c -=================================================================== ---- ccs/macintosh.c (revision 603239) -+++ ccs/macintosh.c (working copy) -@@ -444,7 +444,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(macintosh) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/osd_ebcdic_df04_1.c -=================================================================== ---- ccs/osd_ebcdic_df04_1.c (revision 603239) -+++ ccs/osd_ebcdic_df04_1.c (working copy) -@@ -140,7 +140,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(osd_ebcdic_df04_1) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/osd_ebcdic_df04_15.c -=================================================================== ---- ccs/osd_ebcdic_df04_15.c (revision 603239) -+++ ccs/osd_ebcdic_df04_15.c (working copy) -@@ -210,7 +210,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(osd_ebcdic_df04_15) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/shift_jis.c -=================================================================== ---- ccs/shift_jis.c (revision 603239) -+++ ccs/shift_jis.c (working copy) -@@ -4749,7 +4749,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(shift_jis) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/us-ascii.c -=================================================================== ---- ccs/us-ascii.c (revision 603239) -+++ ccs/us-ascii.c (working copy) -@@ -113,7 +113,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(us_ascii) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1250.c -=================================================================== ---- ccs/windows-1250.c (revision 603239) -+++ ccs/windows-1250.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1250) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1251.c -=================================================================== ---- ccs/windows-1251.c (revision 603239) -+++ ccs/windows-1251.c (working copy) -@@ -234,7 +234,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1251) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1252.c -=================================================================== ---- ccs/windows-1252.c (revision 603239) -+++ ccs/windows-1252.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1252) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1253.c -=================================================================== ---- ccs/windows-1253.c (revision 603239) -+++ ccs/windows-1253.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1253) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1254.c -=================================================================== ---- ccs/windows-1254.c (revision 603239) -+++ ccs/windows-1254.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1254) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1255.c -=================================================================== ---- ccs/windows-1255.c (revision 603239) -+++ ccs/windows-1255.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1255) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1256.c -=================================================================== ---- ccs/windows-1256.c (revision 603239) -+++ ccs/windows-1256.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1256) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1257.c -=================================================================== ---- ccs/windows-1257.c (revision 603239) -+++ ccs/windows-1257.c (working copy) -@@ -269,7 +269,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1257) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ccs/windows-1258.c -=================================================================== ---- ccs/windows-1258.c (revision 603239) -+++ ccs/windows-1258.c (working copy) -@@ -304,7 +304,7 @@ - convert_from_ucs, convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(windows_1258) = { - ICMOD_UC_CCS, - apr_iconv_mod_noevent, - NULL, -Index: ces/_tbl_simple.c -=================================================================== ---- ces/_tbl_simple.c (revision 603239) -+++ ces/_tbl_simple.c (working copy) -@@ -176,7 +176,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(_tbl_simple) = { - ICMOD_UC_CES, - table_event, - NULL, -Index: ces/euc-jp.c -=================================================================== ---- ces/euc-jp.c (revision 603239) -+++ ces/euc-jp.c (working copy) -@@ -72,7 +72,7 @@ - apr_iconv_euc_convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(euc_jp) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/euc-kr.c -=================================================================== ---- ces/euc-kr.c (revision 603239) -+++ ces/euc-kr.c (working copy) -@@ -65,7 +65,7 @@ - apr_iconv_euc_convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(euc_kr) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/euc-tw.c -=================================================================== ---- ces/euc-tw.c (revision 603239) -+++ ces/euc-tw.c (working copy) -@@ -69,7 +69,7 @@ - apr_iconv_euc_convert_to_ucs, - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(euc_tw) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/gb2312.c -=================================================================== ---- ces/gb2312.c (revision 603239) -+++ ces/gb2312.c (working copy) -@@ -65,7 +65,7 @@ - apr_iconv_euc_convert_to_ucs - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(gb2312) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/iso-10646-ucs-2.c -=================================================================== ---- ces/iso-10646-ucs-2.c (revision 603239) -+++ ces/iso-10646-ucs-2.c (working copy) -@@ -30,9 +30,10 @@ - * iconv (Charset Conversion Library) v1.0 - */ - -+#include <stdlib.h> /* free, malloc */ -+ - #define ICONV_INTERNAL - #include "iconv.h" --#include <stdlib.h> /* free, malloc */ - - static const char * const names[] = { - "iso-10646-ucs-2", "csUnicode", "ucs-2", NULL -@@ -58,7 +59,7 @@ - bytes = *state ? 2 : 4; - if (*outbytesleft < bytes) - return 0; /* No space in the output buffer */ -- if (*state == 0) { -+ if (*state) { - *(*outbuf)++ = 0xFE; - *(*outbuf)++ = 0xFF; - *state = 1; -@@ -125,7 +126,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_10646_ucs_2) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/iso-10646-ucs-4.c -=================================================================== ---- ces/iso-10646-ucs-4.c (revision 603239) -+++ ces/iso-10646-ucs-4.c (working copy) -@@ -30,11 +30,11 @@ - * iconv (Charset Conversion Library) v1.0 - */ - -+#include <stdlib.h> /* free, malloc */ -+ - #define ICONV_INTERNAL - #include "iconv.h" --#include <stdlib.h> /* free, malloc */ - -- - static const char * const names[] = { - "iso-10646-ucs-2", "ucs-4", "ucs4", NULL - }; -@@ -130,7 +130,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_10646_ucs_4) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/iso-2022-cn.c -=================================================================== ---- ces/iso-2022-cn.c (revision 603239) -+++ ces/iso-2022-cn.c (working copy) -@@ -72,7 +72,7 @@ - shift_tab - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_2022_cn) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/iso-2022-jp-2.c -=================================================================== ---- ces/iso-2022-jp-2.c (revision 603239) -+++ ces/iso-2022-jp-2.c (working copy) -@@ -84,7 +84,7 @@ - shift_tab - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_2022_jp_2) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/iso-2022-jp.c -=================================================================== ---- ces/iso-2022-jp.c (revision 603239) -+++ ces/iso-2022-jp.c (working copy) -@@ -74,7 +74,7 @@ - shift_tab - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_2022_jp) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/iso-2022-kr.c -=================================================================== ---- ces/iso-2022-kr.c (revision 603239) -+++ ces/iso-2022-kr.c (working copy) -@@ -69,7 +69,7 @@ - shift_tab - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(iso_2022_kr) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - iconv_module_depend, -Index: ces/ucs2-internal.c -=================================================================== ---- ces/ucs2-internal.c (revision 603239) -+++ ces/ucs2-internal.c (working copy) -@@ -90,7 +90,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ucs2_internal) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/ucs4-internal.c -=================================================================== ---- ces/ucs4-internal.c (revision 603239) -+++ ces/ucs4-internal.c (working copy) -@@ -88,7 +88,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(ucs4_internal) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/unicode-1-1-utf-7.c -=================================================================== ---- ces/unicode-1-1-utf-7.c (revision 603239) -+++ ces/unicode-1-1-utf-7.c (working copy) -@@ -295,7 +295,7 @@ - convert_to_ucs, NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(unicode_1_1_utf_7) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/utf-16.c -=================================================================== ---- ces/utf-16.c (revision 603239) -+++ ces/utf-16.c (working copy) -@@ -147,7 +147,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(utf_16) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: ces/utf-8.c -=================================================================== ---- ces/utf-8.c (revision 603239) -+++ ces/utf-8.c (working copy) -@@ -150,7 +150,7 @@ - NULL - }; - --struct iconv_module_desc iconv_module = { -+API_DECLARE_MODULE(utf_8) = { - ICMOD_UC_CES, - apr_iconv_mod_noevent, - NULL, -Index: lib/iconv.h -=================================================================== ---- lib/iconv.h (revision 603239) -+++ lib/iconv.h (working copy) -@@ -130,6 +130,8 @@ - iconv_conv_t * icd_conv; - }; - -+typedef struct iconv_module_desc iconv_module_desc_t; -+ - struct iconv_converter { - struct iconv_converter_desc *ic_desc; - void * ic_data; -@@ -348,7 +350,6 @@ - - extern struct iconv_converter_desc iconv_uc_desc; - -- - API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx); - API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces); - API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); -@@ -360,6 +361,17 @@ - API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); - API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft); - -+#ifdef API_MODULE_STATIC -+#define API_DECLARE_MODULE(M) iconv_module_desc_t M##_iconv_module -+#define API_IMPORT_MODULE(M) extern iconv_module_desc_t M##_iconv_module -+#define API_USE_MODULE(M) 1, &M##_iconv_module -+#else -+#define API_DECLARE_MODULE(M) iconv_module_desc_t iconv_module -+#define API_IMPORT_MODULE(M) -+#define API_USE_MODULE(M) 0, NULL -+ -+#endif -+ - #endif /* ICONV_INTERNAL */ - - #endif /* _ICONV_H_ */ -Index: lib/iconv_module.c -=================================================================== ---- lib/iconv_module.c (revision 603239) -+++ lib/iconv_module.c (working copy) -@@ -52,6 +52,510 @@ - - #define APR_ICONV_PATH "APR_ICONV" API_STRINGIFY(API_MAJOR_VERSION) "_PATH" - -+API_IMPORT_MODULE(_tbl_simple); -+API_IMPORT_MODULE(adobe_stdenc); -+API_IMPORT_MODULE(adobe_symbol); -+API_IMPORT_MODULE(adobe_zdingbats); -+API_IMPORT_MODULE(big5); -+API_IMPORT_MODULE(cns11643_plane1); -+API_IMPORT_MODULE(cns11643_plane14); -+API_IMPORT_MODULE(cns11643_plane2); -+API_IMPORT_MODULE(cp037); -+API_IMPORT_MODULE(cp038); -+API_IMPORT_MODULE(cp10000); -+API_IMPORT_MODULE(cp10006); -+API_IMPORT_MODULE(cp10007); -+API_IMPORT_MODULE(cp10029); -+API_IMPORT_MODULE(cp1006); -+API_IMPORT_MODULE(cp10079); -+API_IMPORT_MODULE(cp10081); -+API_IMPORT_MODULE(cp1026); -+API_IMPORT_MODULE(cp273); -+API_IMPORT_MODULE(cp274); -+API_IMPORT_MODULE(cp275); -+API_IMPORT_MODULE(cp277); -+API_IMPORT_MODULE(cp278); -+API_IMPORT_MODULE(cp280); -+API_IMPORT_MODULE(cp281); -+API_IMPORT_MODULE(cp284); -+API_IMPORT_MODULE(cp285); -+API_IMPORT_MODULE(cp290); -+API_IMPORT_MODULE(cp297); -+API_IMPORT_MODULE(cp420); -+API_IMPORT_MODULE(cp423); -+API_IMPORT_MODULE(cp424); -+API_IMPORT_MODULE(cp437); -+API_IMPORT_MODULE(cp500); -+API_IMPORT_MODULE(cp737); -+API_IMPORT_MODULE(cp775); -+API_IMPORT_MODULE(cp850); -+API_IMPORT_MODULE(cp851); -+API_IMPORT_MODULE(cp852); -+API_IMPORT_MODULE(cp855); -+API_IMPORT_MODULE(cp856); -+API_IMPORT_MODULE(cp857); -+API_IMPORT_MODULE(cp860); -+API_IMPORT_MODULE(cp861); -+API_IMPORT_MODULE(cp862); -+API_IMPORT_MODULE(cp863); -+API_IMPORT_MODULE(cp864); -+API_IMPORT_MODULE(cp865); -+API_IMPORT_MODULE(cp866); -+API_IMPORT_MODULE(cp868); -+API_IMPORT_MODULE(cp869); -+API_IMPORT_MODULE(cp870); -+API_IMPORT_MODULE(cp871); -+API_IMPORT_MODULE(cp874); -+API_IMPORT_MODULE(cp875); -+API_IMPORT_MODULE(cp880); -+API_IMPORT_MODULE(cp891); -+API_IMPORT_MODULE(cp903); -+API_IMPORT_MODULE(cp904); -+API_IMPORT_MODULE(cp905); -+API_IMPORT_MODULE(cp918); -+API_IMPORT_MODULE(cp932); -+API_IMPORT_MODULE(cp936); -+API_IMPORT_MODULE(cp949); -+API_IMPORT_MODULE(cp950); -+API_IMPORT_MODULE(dec_mcs); -+API_IMPORT_MODULE(ebcdic_at_de); -+API_IMPORT_MODULE(ebcdic_at_de_a); -+API_IMPORT_MODULE(ebcdic_ca_fr); -+API_IMPORT_MODULE(ebcdic_dk_no); -+API_IMPORT_MODULE(ebcdic_dk_no_a); -+API_IMPORT_MODULE(ebcdic_es); -+API_IMPORT_MODULE(ebcdic_es_a); -+API_IMPORT_MODULE(ebcdic_es_s); -+API_IMPORT_MODULE(ebcdic_fi_se); -+API_IMPORT_MODULE(ebcdic_fi_se_a); -+API_IMPORT_MODULE(ebcdic_fr); -+API_IMPORT_MODULE(ebcdic_it); -+API_IMPORT_MODULE(ebcdic_pt); -+API_IMPORT_MODULE(ebcdic_uk); -+API_IMPORT_MODULE(ebcdic_us); -+API_IMPORT_MODULE(euc_jp); -+API_IMPORT_MODULE(euc_kr); -+API_IMPORT_MODULE(euc_tw); -+API_IMPORT_MODULE(gb12345); -+API_IMPORT_MODULE(gb2312); -+API_IMPORT_MODULE(gb_2312_80); -+API_IMPORT_MODULE(hp_roman8); -+API_IMPORT_MODULE(iso646_dk); -+API_IMPORT_MODULE(iso646_kr); -+API_IMPORT_MODULE(iso_10646_ucs_2); -+API_IMPORT_MODULE(iso_10646_ucs_4); -+API_IMPORT_MODULE(iso_2022_cn); -+API_IMPORT_MODULE(iso_2022_jp); -+API_IMPORT_MODULE(iso_2022_jp_2); -+API_IMPORT_MODULE(iso_2022_kr); -+API_IMPORT_MODULE(iso_8859_1); -+API_IMPORT_MODULE(iso_8859_10); -+API_IMPORT_MODULE(iso_8859_13); -+API_IMPORT_MODULE(iso_8859_14); -+API_IMPORT_MODULE(iso_8859_15); -+API_IMPORT_MODULE(iso_8859_2); -+API_IMPORT_MODULE(iso_8859_3); -+API_IMPORT_MODULE(iso_8859_4); -+API_IMPORT_MODULE(iso_8859_5); -+API_IMPORT_MODULE(iso_8859_6); -+API_IMPORT_MODULE(iso_8859_7); -+API_IMPORT_MODULE(iso_8859_8); -+API_IMPORT_MODULE(iso_8859_9); -+API_IMPORT_MODULE(iso_ir_10); -+API_IMPORT_MODULE(iso_ir_102); -+API_IMPORT_MODULE(iso_ir_103); -+API_IMPORT_MODULE(iso_ir_11); -+API_IMPORT_MODULE(iso_ir_111); -+API_IMPORT_MODULE(iso_ir_121); -+API_IMPORT_MODULE(iso_ir_122); -+API_IMPORT_MODULE(iso_ir_123); -+API_IMPORT_MODULE(iso_ir_128); -+API_IMPORT_MODULE(iso_ir_13); -+API_IMPORT_MODULE(iso_ir_139); -+API_IMPORT_MODULE(iso_ir_14); -+API_IMPORT_MODULE(iso_ir_141); -+API_IMPORT_MODULE(iso_ir_142); -+API_IMPORT_MODULE(iso_ir_143); -+API_IMPORT_MODULE(iso_ir_146); -+API_IMPORT_MODULE(iso_ir_147); -+API_IMPORT_MODULE(iso_ir_15); -+API_IMPORT_MODULE(iso_ir_150); -+API_IMPORT_MODULE(iso_ir_151); -+API_IMPORT_MODULE(iso_ir_152); -+API_IMPORT_MODULE(iso_ir_153); -+API_IMPORT_MODULE(iso_ir_154); -+API_IMPORT_MODULE(iso_ir_155); -+API_IMPORT_MODULE(iso_ir_158); -+API_IMPORT_MODULE(iso_ir_16); -+API_IMPORT_MODULE(iso_ir_17); -+API_IMPORT_MODULE(iso_ir_18); -+API_IMPORT_MODULE(iso_ir_19); -+API_IMPORT_MODULE(iso_ir_2); -+API_IMPORT_MODULE(iso_ir_21); -+API_IMPORT_MODULE(iso_ir_25); -+API_IMPORT_MODULE(iso_ir_27); -+API_IMPORT_MODULE(iso_ir_37); -+API_IMPORT_MODULE(iso_ir_4); -+API_IMPORT_MODULE(iso_ir_47); -+API_IMPORT_MODULE(iso_ir_49); -+API_IMPORT_MODULE(iso_ir_50); -+API_IMPORT_MODULE(iso_ir_51); -+API_IMPORT_MODULE(iso_ir_54); -+API_IMPORT_MODULE(iso_ir_55); -+API_IMPORT_MODULE(iso_ir_57); -+API_IMPORT_MODULE(iso_ir_60); -+API_IMPORT_MODULE(iso_ir_61); -+API_IMPORT_MODULE(iso_ir_69); -+API_IMPORT_MODULE(iso_ir_70); -+API_IMPORT_MODULE(iso_ir_84); -+API_IMPORT_MODULE(iso_ir_85); -+API_IMPORT_MODULE(iso_ir_86); -+API_IMPORT_MODULE(iso_ir_88); -+API_IMPORT_MODULE(iso_ir_89); -+API_IMPORT_MODULE(iso_ir_8_1); -+API_IMPORT_MODULE(iso_ir_8_2); -+API_IMPORT_MODULE(iso_ir_90); -+API_IMPORT_MODULE(iso_ir_91); -+API_IMPORT_MODULE(iso_ir_92); -+API_IMPORT_MODULE(iso_ir_93); -+API_IMPORT_MODULE(iso_ir_94); -+API_IMPORT_MODULE(iso_ir_95); -+API_IMPORT_MODULE(iso_ir_96); -+API_IMPORT_MODULE(iso_ir_98); -+API_IMPORT_MODULE(iso_ir_99); -+API_IMPORT_MODULE(iso_ir_9_1); -+API_IMPORT_MODULE(iso_ir_9_2); -+API_IMPORT_MODULE(jis_x0201); -+API_IMPORT_MODULE(jis_x0208_1983); -+API_IMPORT_MODULE(jis_x0212_1990); -+API_IMPORT_MODULE(johab); -+API_IMPORT_MODULE(koi8_r); -+API_IMPORT_MODULE(koi8_ru); -+API_IMPORT_MODULE(koi8_u); -+API_IMPORT_MODULE(ksx1001); -+API_IMPORT_MODULE(mac_ce); -+API_IMPORT_MODULE(mac_croatian); -+API_IMPORT_MODULE(mac_cyrillic); -+API_IMPORT_MODULE(mac_dingbats); -+API_IMPORT_MODULE(mac_greek); -+API_IMPORT_MODULE(mac_iceland); -+API_IMPORT_MODULE(mac_japan); -+API_IMPORT_MODULE(mac_roman); -+API_IMPORT_MODULE(mac_romania); -+API_IMPORT_MODULE(mac_thai); -+API_IMPORT_MODULE(mac_turkish); -+API_IMPORT_MODULE(mac_ukraine); -+API_IMPORT_MODULE(macintosh); -+API_IMPORT_MODULE(osd_ebcdic_df04_1); -+API_IMPORT_MODULE(osd_ebcdic_df04_15); -+API_IMPORT_MODULE(shift_jis); -+API_IMPORT_MODULE(ucs2_internal); -+API_IMPORT_MODULE(ucs4_internal); -+API_IMPORT_MODULE(unicode_1_1_utf_7); -+API_IMPORT_MODULE(us_ascii); -+API_IMPORT_MODULE(utf_16); -+API_IMPORT_MODULE(utf_8); -+API_IMPORT_MODULE(windows_1250); -+API_IMPORT_MODULE(windows_1251); -+API_IMPORT_MODULE(windows_1252); -+API_IMPORT_MODULE(windows_1253); -+API_IMPORT_MODULE(windows_1254); -+API_IMPORT_MODULE(windows_1255); -+API_IMPORT_MODULE(windows_1256); -+API_IMPORT_MODULE(windows_1257); -+API_IMPORT_MODULE(windows_1258); -+ -+static struct static_iconv_module { -+ const char *name; -+ int present; -+ iconv_module_desc_t *module; -+} const static_iconv_modules[] = { -+ { "_tbl_simple", API_USE_MODULE(_tbl_simple) }, -+ { "adobe-stdenc", API_USE_MODULE(adobe_stdenc) }, -+ { "adobe-symbol", API_USE_MODULE(adobe_symbol) }, -+ { "adobe-zdingbats", API_USE_MODULE(adobe_zdingbats) }, -+ { "big5", API_USE_MODULE(big5) }, -+ { "cns11643-plane1", API_USE_MODULE(cns11643_plane1) }, -+ { "cns11643-plane14", API_USE_MODULE(cns11643_plane14) }, -+ { "cns11643-plane2", API_USE_MODULE(cns11643_plane2) }, -+ { "cp037", API_USE_MODULE(cp037) }, -+ { "cp038", API_USE_MODULE(cp038) }, -+ { "cp10000", API_USE_MODULE(cp10000) }, -+ { "cp10006", API_USE_MODULE(cp10006) }, -+ { "cp10007", API_USE_MODULE(cp10007) }, -+ { "cp10029", API_USE_MODULE(cp10029) }, -+ { "cp1006", API_USE_MODULE(cp1006) }, -+ { "cp10079", API_USE_MODULE(cp10079) }, -+ { "cp10081", API_USE_MODULE(cp10081) }, -+ { "cp1026", API_USE_MODULE(cp1026) }, -+ { "cp273", API_USE_MODULE(cp273) }, -+ { "cp274", API_USE_MODULE(cp274) }, -+ { "cp275", API_USE_MODULE(cp275) }, -+ { "cp277", API_USE_MODULE(cp277) }, -+ { "cp278", API_USE_MODULE(cp278) }, -+ { "cp280", API_USE_MODULE(cp280) }, -+ { "cp281", API_USE_MODULE(cp281) }, -+ { "cp284", API_USE_MODULE(cp284) }, -+ { "cp285", API_USE_MODULE(cp285) }, -+ { "cp290", API_USE_MODULE(cp290) }, -+ { "cp297", API_USE_MODULE(cp297) }, -+ { "cp420", API_USE_MODULE(cp420) }, -+ { "cp423", API_USE_MODULE(cp423) }, -+ { "cp424", API_USE_MODULE(cp424) }, -+ { "cp437", API_USE_MODULE(cp437) }, -+ { "cp500", API_USE_MODULE(cp500) }, -+ { "cp737", API_USE_MODULE(cp737) }, -+ { "cp775", API_USE_MODULE(cp775) }, -+ { "cp850", API_USE_MODULE(cp850) }, -+ { "cp851", API_USE_MODULE(cp851) }, -+ { "cp852", API_USE_MODULE(cp852) }, -+ { "cp855", API_USE_MODULE(cp855) }, -+ { "cp856", API_USE_MODULE(cp856) }, -+ { "cp857", API_USE_MODULE(cp857) }, -+ { "cp860", API_USE_MODULE(cp860) }, -+ { "cp861", API_USE_MODULE(cp861) }, -+ { "cp862", API_USE_MODULE(cp862) }, -+ { "cp863", API_USE_MODULE(cp863) }, -+ { "cp864", API_USE_MODULE(cp864) }, -+ { "cp865", API_USE_MODULE(cp865) }, -+ { "cp866", API_USE_MODULE(cp866) }, -+ { "cp868", API_USE_MODULE(cp868) }, -+ { "cp869", API_USE_MODULE(cp869) }, -+ { "cp870", API_USE_MODULE(cp870) }, -+ { "cp871", API_USE_MODULE(cp871) }, -+ { "cp874", API_USE_MODULE(cp874) }, -+ { "cp875", API_USE_MODULE(cp875) }, -+ { "cp880", API_USE_MODULE(cp880) }, -+ { "cp891", API_USE_MODULE(cp891) }, -+ { "cp903", API_USE_MODULE(cp903) }, -+ { "cp904", API_USE_MODULE(cp904) }, -+ { "cp905", API_USE_MODULE(cp905) }, -+ { "cp918", API_USE_MODULE(cp918) }, -+ { "cp932", API_USE_MODULE(cp932) }, -+ { "cp936", API_USE_MODULE(cp936) }, -+ { "cp949", API_USE_MODULE(cp949) }, -+ { "cp950", API_USE_MODULE(cp950) }, -+ { "dec-mcs", API_USE_MODULE(dec_mcs) }, -+ { "ebcdic-at-de", API_USE_MODULE(ebcdic_at_de) }, -+ { "ebcdic-at-de-a", API_USE_MODULE(ebcdic_at_de_a) }, -+ { "ebcdic-ca-fr", API_USE_MODULE(ebcdic_ca_fr) }, -+ { "ebcdic-dk-no", API_USE_MODULE(ebcdic_dk_no) }, -+ { "ebcdic-dk-no-a", API_USE_MODULE(ebcdic_dk_no_a) }, -+ { "ebcdic-es", API_USE_MODULE(ebcdic_es) }, -+ { "ebcdic-es-a", API_USE_MODULE(ebcdic_es_a) }, -+ { "ebcdic-es-s", API_USE_MODULE(ebcdic_es_s) }, -+ { "ebcdic-fi-se", API_USE_MODULE(ebcdic_fi_se) }, -+ { "ebcdic-fi-se-a", API_USE_MODULE(ebcdic_fi_se_a) }, -+ { "ebcdic-fr", API_USE_MODULE(ebcdic_fr) }, -+ { "ebcdic-it", API_USE_MODULE(ebcdic_it) }, -+ { "ebcdic-pt", API_USE_MODULE(ebcdic_pt) }, -+ { "ebcdic-uk", API_USE_MODULE(ebcdic_uk) }, -+ { "ebcdic-us", API_USE_MODULE(ebcdic_us) }, -+ { "euc-jp", API_USE_MODULE(euc_jp) }, -+ { "euc-kr", API_USE_MODULE(euc_kr) }, -+ { "euc-tw", API_USE_MODULE(euc_tw) }, -+ { "gb12345", API_USE_MODULE(gb12345) }, -+ { "gb2312", API_USE_MODULE(gb2312) }, -+ { "gb_2312-80", API_USE_MODULE(gb_2312_80) }, -+ { "hp-roman8", API_USE_MODULE(hp_roman8) }, -+ { "iso646-dk", API_USE_MODULE(iso646_dk) }, -+ { "iso646-kr", API_USE_MODULE(iso646_kr) }, -+ { "iso-10646-ucs-2", API_USE_MODULE(iso_10646_ucs_2) }, -+ { "iso-10646-ucs-4", API_USE_MODULE(iso_10646_ucs_4) }, -+ { "iso-2022-cn", API_USE_MODULE(iso_2022_cn) }, -+ { "iso-2022-jp", API_USE_MODULE(iso_2022_jp) }, -+ { "iso-2022-jp-2", API_USE_MODULE(iso_2022_jp_2) }, -+ { "iso-2022-kr", API_USE_MODULE(iso_2022_kr) }, -+ { "iso-8859-1", API_USE_MODULE(iso_8859_1) }, -+ { "iso-8859-10", API_USE_MODULE(iso_8859_10) }, -+ { "iso-8859-13", API_USE_MODULE(iso_8859_13) }, -+ { "iso-8859-14", API_USE_MODULE(iso_8859_14) }, -+ { "iso-8859-15", API_USE_MODULE(iso_8859_15) }, -+ { "iso-8859-2", API_USE_MODULE(iso_8859_2) }, -+ { "iso-8859-3", API_USE_MODULE(iso_8859_3) }, -+ { "iso-8859-4", API_USE_MODULE(iso_8859_4) }, -+ { "iso-8859-5", API_USE_MODULE(iso_8859_5) }, -+ { "iso-8859-6", API_USE_MODULE(iso_8859_6) }, -+ { "iso-8859-7", API_USE_MODULE(iso_8859_7) }, -+ { "iso-8859-8", API_USE_MODULE(iso_8859_8) }, -+ { "iso-8859-9", API_USE_MODULE(iso_8859_9) }, -+ { "iso-ir-10", API_USE_MODULE(iso_ir_10) }, -+ { "iso-ir-102", API_USE_MODULE(iso_ir_102) }, -+ { "iso-ir-103", API_USE_MODULE(iso_ir_103) }, -+ { "iso-ir-11", API_USE_MODULE(iso_ir_11) }, -+ { "iso-ir-111", API_USE_MODULE(iso_ir_111) }, -+ { "iso-ir-121", API_USE_MODULE(iso_ir_121) }, -+ { "iso-ir-122", API_USE_MODULE(iso_ir_122) }, -+ { "iso-ir-123", API_USE_MODULE(iso_ir_123) }, -+ { "iso-ir-128", API_USE_MODULE(iso_ir_128) }, -+ { "iso-ir-13", API_USE_MODULE(iso_ir_13) }, -+ { "iso-ir-139", API_USE_MODULE(iso_ir_139) }, -+ { "iso-ir-14", API_USE_MODULE(iso_ir_14) }, -+ { "iso-ir-141", API_USE_MODULE(iso_ir_141) }, -+ { "iso-ir-142", API_USE_MODULE(iso_ir_142) }, -+ { "iso-ir-143", API_USE_MODULE(iso_ir_143) }, -+ { "iso-ir-146", API_USE_MODULE(iso_ir_146) }, -+ { "iso-ir-147", API_USE_MODULE(iso_ir_147) }, -+ { "iso-ir-15", API_USE_MODULE(iso_ir_15) }, -+ { "iso-ir-150", API_USE_MODULE(iso_ir_150) }, -+ { "iso-ir-151", API_USE_MODULE(iso_ir_151) }, -+ { "iso-ir-152", API_USE_MODULE(iso_ir_152) }, -+ { "iso-ir-153", API_USE_MODULE(iso_ir_153) }, -+ { "iso-ir-154", API_USE_MODULE(iso_ir_154) }, -+ { "iso-ir-155", API_USE_MODULE(iso_ir_155) }, -+ { "iso-ir-158", API_USE_MODULE(iso_ir_158) }, -+ { "iso-ir-16", API_USE_MODULE(iso_ir_16) }, -+ { "iso-ir-17", API_USE_MODULE(iso_ir_17) }, -+ { "iso-ir-18", API_USE_MODULE(iso_ir_18) }, -+ { "iso-ir-19", API_USE_MODULE(iso_ir_19) }, -+ { "iso-ir-2", API_USE_MODULE(iso_ir_2) }, -+ { "iso-ir-21", API_USE_MODULE(iso_ir_21) }, -+ { "iso-ir-25", API_USE_MODULE(iso_ir_25) }, -+ { "iso-ir-27", API_USE_MODULE(iso_ir_27) }, -+ { "iso-ir-37", API_USE_MODULE(iso_ir_37) }, -+ { "iso-ir-4", API_USE_MODULE(iso_ir_4) }, -+ { "iso-ir-47", API_USE_MODULE(iso_ir_47) }, -+ { "iso-ir-49", API_USE_MODULE(iso_ir_49) }, -+ { "iso-ir-50", API_USE_MODULE(iso_ir_50) }, -+ { "iso-ir-51", API_USE_MODULE(iso_ir_51) }, -+ { "iso-ir-54", API_USE_MODULE(iso_ir_54) }, -+ { "iso-ir-55", API_USE_MODULE(iso_ir_55) }, -+ { "iso-ir-57", API_USE_MODULE(iso_ir_57) }, -+ { "iso-ir-60", API_USE_MODULE(iso_ir_60) }, -+ { "iso-ir-61", API_USE_MODULE(iso_ir_61) }, -+ { "iso-ir-69", API_USE_MODULE(iso_ir_69) }, -+ { "iso-ir-70", API_USE_MODULE(iso_ir_70) }, -+ { "iso-ir-84", API_USE_MODULE(iso_ir_84) }, -+ { "iso-ir-85", API_USE_MODULE(iso_ir_85) }, -+ { "iso-ir-86", API_USE_MODULE(iso_ir_86) }, -+ { "iso-ir-88", API_USE_MODULE(iso_ir_88) }, -+ { "iso-ir-89", API_USE_MODULE(iso_ir_89) }, -+ { "iso-ir-8-1", API_USE_MODULE(iso_ir_8_1) }, -+ { "iso-ir-8-2", API_USE_MODULE(iso_ir_8_2) }, -+ { "iso-ir-90", API_USE_MODULE(iso_ir_90) }, -+ { "iso-ir-91", API_USE_MODULE(iso_ir_91) }, -+ { "iso-ir-92", API_USE_MODULE(iso_ir_92) }, -+ { "iso-ir-93", API_USE_MODULE(iso_ir_93) }, -+ { "iso-ir-94", API_USE_MODULE(iso_ir_94) }, -+ { "iso-ir-95", API_USE_MODULE(iso_ir_95) }, -+ { "iso-ir-96", API_USE_MODULE(iso_ir_96) }, -+ { "iso-ir-98", API_USE_MODULE(iso_ir_98) }, -+ { "iso-ir-99", API_USE_MODULE(iso_ir_99) }, -+ { "iso-ir-9-1", API_USE_MODULE(iso_ir_9_1) }, -+ { "iso-ir-9-2", API_USE_MODULE(iso_ir_9_2) }, -+ { "jis_x0201", API_USE_MODULE(jis_x0201) }, -+ { "jis_x0208-1983", API_USE_MODULE(jis_x0208_1983) }, -+ { "jis_x0212-1990", API_USE_MODULE(jis_x0212_1990) }, -+ { "johab", API_USE_MODULE(johab) }, -+ { "koi8-r", API_USE_MODULE(koi8_r) }, -+ { "koi8-ru", API_USE_MODULE(koi8_ru) }, -+ { "koi8-u", API_USE_MODULE(koi8_u) }, -+ { "ksx1001", API_USE_MODULE(ksx1001) }, -+ { "mac-ce", API_USE_MODULE(mac_ce) }, -+ { "mac-croatian", API_USE_MODULE(mac_croatian) }, -+ { "mac-cyrillic", API_USE_MODULE(mac_cyrillic) }, -+ { "mac-dingbats", API_USE_MODULE(mac_dingbats) }, -+ { "mac-greek", API_USE_MODULE(mac_greek) }, -+ { "mac-iceland", API_USE_MODULE(mac_iceland) }, -+ { "mac-japan", API_USE_MODULE(mac_japan) }, -+ { "mac-roman", API_USE_MODULE(mac_roman) }, -+ { "mac-romania", API_USE_MODULE(mac_romania) }, -+ { "mac-thai", API_USE_MODULE(mac_thai) }, -+ { "mac-turkish", API_USE_MODULE(mac_turkish) }, -+ { "mac-ukraine", API_USE_MODULE(mac_ukraine) }, -+ { "macintosh", API_USE_MODULE(macintosh) }, -+ { "osd_ebcdic_df04_1", API_USE_MODULE(osd_ebcdic_df04_1) }, -+ { "osd_ebcdic_df04_15", API_USE_MODULE(osd_ebcdic_df04_15) }, -+ { "shift_jis", API_USE_MODULE(shift_jis) }, -+ { "ucs2-internal", API_USE_MODULE(ucs2_internal) }, -+ { "ucs4-internal", API_USE_MODULE(ucs4_internal) }, -+ { "unicode-1-1-utf-7", API_USE_MODULE(unicode_1_1_utf_7) }, -+ { "us-ascii", API_USE_MODULE(us_ascii) }, -+ { "utf-16", API_USE_MODULE(utf_16) }, -+ { "utf-8", API_USE_MODULE(utf_8) }, -+ { "windows-1250", API_USE_MODULE(windows_1250) }, -+ { "windows-1251", API_USE_MODULE(windows_1251) }, -+ { "windows-1252", API_USE_MODULE(windows_1252) }, -+ { "windows-1253", API_USE_MODULE(windows_1253) }, -+ { "windows-1254", API_USE_MODULE(windows_1254) }, -+ { "windows-1255", API_USE_MODULE(windows_1255) }, -+ { "windows-1256", API_USE_MODULE(windows_1256) }, -+ { "windows-1257", API_USE_MODULE(windows_1257) }, -+ { "windows-1258", API_USE_MODULE(windows_1258) }, -+ -+ { NULL, 0, NULL} -+}; -+ -+static const size_t static_iconv_modules_count = -+ sizeof(static_iconv_modules)/sizeof(static_iconv_modules[0]) - 1; -+ -+ -+/* Compare two static modules. */ -+static int static_iconv_module_compare (const void *u, const void *v) -+{ -+ const struct static_iconv_module *const a = u; -+ const struct static_iconv_module *const b = v; -+ return strcmp(a->name, b->name); -+} -+ -+static iconv_module_desc_t *static_iconv_module_find(const char *name) -+{ -+ struct static_iconv_module key; -+ struct static_iconv_module *val; -+#if 'A' == '\xC1' /* if EBCDIC host */ -+ /* The table is sorted in ASCII collation order, not in EBCDIC order. -+ * At the first access, we sort it automatically -+ * Criterion for the 1st time initialization is the fact that the -+ * 1st name in the list starts with a digit (in ASCII, numbers -+ * have a lower ordinal value than alphabetic characters; while -+ * in EBCDIC, their ordinal value is higher) -+ */ -+ if (isdigit(static_iconv_modules[0].name[0])) { -+ qsort((void *)static_iconv_modules, static_iconv_modules_count, -+ sizeof(static_iconv_modules[0]), -+ static_iconv_module_compare); -+ } -+#endif -+ key.name = name; -+ val = bsearch(&key, static_iconv_modules, static_iconv_modules_count, -+ sizeof(static_iconv_modules[0]), -+ static_iconv_module_compare); -+ if (val) -+ return val->module; -+ else -+ return NULL; -+} -+ -+ -+static int -+iconv_smopen(const char *name, void **dpp) -+{ -+ -+ char buffer[APR_PATH_MAX]; -+ char *ptr; -+ iconv_module_desc_t *module; -+ -+ if (apr_tolower(name[0]) == 'x' && name[1] == '-') -+ name += 2; -+ ptr = buffer; -+ while (0 != (*ptr++ = apr_tolower(*name++))) -+ module = static_iconv_module_find(buffer); -+ if (!module) { -+ const char *alias = charset_alias_find(buffer); -+ if (alias) { -+ if ((module = static_iconv_module_find(alias))) { -+ *dpp = module; -+ return 0; -+ } -+ } -+ } -+ else { -+ *dpp = module; -+ return 0; -+ } -+ return EINVAL; -+} -+ - static apr_status_t - iconv_getpathname(char *buffer, const char *dir, const char *name, apr_pool_t *ctx) - { -@@ -140,6 +644,7 @@ - return EINVAL; - } - -+ - API_DECLARE_NONSTD(int) - apr_iconv_mod_load(const char *modname, int modtype, const void *args, - struct iconv_module **modpp, apr_pool_t *ctx) -@@ -148,22 +653,28 @@ - struct iconv_module *mod, *depmod; - const struct iconv_module_depend *depend; - char buffer[APR_PATH_MAX]; -- void *handle; -+ void *handle = NULL; - int error; -+ -+ /* Try to load the built-in modules first */ -+ error = iconv_smopen(modname, (void**)&mdesc); -+ if (error) { -+ if (iconv_getpath(buffer, modname, ctx) != 0) -+ return EINVAL; - -- if (iconv_getpath(buffer, modname, ctx) != 0) -- return EINVAL; -- -- error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); -+ error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); -+ } - if (error) - return error; - if (modtype != ICMOD_ANY && mdesc->imd_type != modtype) { -- apr_dso_unload(handle); -+ if (handle) -+ apr_dso_unload(handle); - return APR_EFTYPE; - } - mod = malloc(sizeof(*mod)); - if (mod == NULL) { -- apr_dso_unload(handle); -+ if (handle) -+ apr_dso_unload(handle); - return ENOMEM; - } - memset(mod, 0, sizeof(*mod));

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1176 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 09:40:47 -0500 (Tue, 11 Dec 2007) New Revision: 1176 Modified: trunk/build/unix/build.sh trunk/build/unix/buildsrc.rhel-httpd.sh Log: Allow to build on HP-UX. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2007-12-11 14:06:50 UTC (rev 1175) +++ trunk/build/unix/build.sh 2007-12-11 14:40:47 UTC (rev 1176) @@ -132,6 +132,14 @@ echo "Using version ${build_version} from `basename ${package_list}`" fi +# Check for some gnu mandadory tools. +patch=`util/find_gnu.sh patch` +if [ "x" = "x${patch}" ]; then + patch=patch + echo "Warning missing gnu patch command" +fi +export patch + # Read apr and openssl version. parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep $build_version` apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'` @@ -595,7 +603,7 @@ if [ -f $build_top/../patch/$DIR.patch ]; then (cd $DIR - patch -tfs -p0 -i $build_top/../patch/$DIR.patch + $patch -tfs -p0 -i $build_top/../patch/$DIR.patch ) fi } Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 14:06:50 UTC (rev 1175) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 14:40:47 UTC (rev 1176) @@ -85,8 +85,8 @@ WHERE=${native_dist}/tools mkdir -p ${WHERE} grep "^%patch" ${rhel_loc}/httpd.spec | sed 's:%:@:' | sed 's: :@ :' | awk ' { print $1 " " $2 } ' > ${WHERE}/patch.cmd -grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed 's/:/@/' | awk ' { print "s:" $1 ": patch -i @DIR@" $2 ":" } ' > ${WHERE}/patch.files -sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:" > ${WHERE}/patch.sh +grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed 's/:/@/' | awk ' { print "s:" $1 ": @PATCH@ -i @DIR@" $2 ":" } ' > ${WHERE}/patch.files +sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:" | sed "s:@PATCH@:${patch}:" > ${WHERE}/patch.sh # # Remove linux specific patches.

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1175 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 09:06:50 -0500 (Tue, 11 Dec 2007) New Revision: 1175 Added: trunk/build/unix/util/find_gnu.sh Log: Find the gnu version of a tool. For patch for example. Added: trunk/build/unix/util/find_gnu.sh =================================================================== --- trunk/build/unix/util/find_gnu.sh (rev 0) +++ trunk/build/unix/util/find_gnu.sh 2007-12-11 14:06:50 UTC (rev 1175) @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright(c) 2007 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# + +# find a gnu command with path. +# $1: The command. +for path in `echo $PATH | sed "s/:/ /g"` +do + file=$path/$1 + $path/$1 --help 2>/dev/null | grep gnu 1>/dev/null + if [ $? -eq 0 ]; then + echo "$path/$1" + break + fi +done Property changes on: trunk/build/unix/util/find_gnu.sh ___________________________________________________________________ Name: svn:executable + *

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1174 - trunk/srclib/apr-iconv.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-11 08:42:35 -0500 (Tue, 11 Dec 2007) New Revision: 1174 Added: trunk/srclib/apr-iconv/apr-iconv-original.patch Log: Add original patch file used to create static module apr-iconv. Added: trunk/srclib/apr-iconv/apr-iconv-original.patch =================================================================== --- trunk/srclib/apr-iconv/apr-iconv-original.patch (rev 0) +++ trunk/srclib/apr-iconv/apr-iconv-original.patch 2007-12-11 13:42:35 UTC (rev 1174) @@ -0,0 +1,3389 @@ +Index: ccs/adobe-stdenc.c +=================================================================== +--- ccs/adobe-stdenc.c (revision 603239) ++++ ccs/adobe-stdenc.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_stdenc) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/adobe-symbol.c +=================================================================== +--- ccs/adobe-symbol.c (revision 603239) ++++ ccs/adobe-symbol.c (working copy) +@@ -479,7 +479,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_symbol)= { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/adobe-zdingbats.c +=================================================================== +--- ccs/adobe-zdingbats.c (revision 603239) ++++ ccs/adobe-zdingbats.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(adobe_zdingbats) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/big5.c +=================================================================== +--- ccs/big5.c (revision 603239) ++++ ccs/big5.c (working copy) +@@ -6674,7 +6674,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(big5) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane1.c +=================================================================== +--- ccs/cns11643-plane1.c (revision 603239) ++++ ccs/cns11643-plane1.c (working copy) +@@ -4708,7 +4708,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane14.c +=================================================================== +--- ccs/cns11643-plane14.c (revision 603239) ++++ ccs/cns11643-plane14.c (working copy) +@@ -4297,7 +4297,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cns11643-plane2.c +=================================================================== +--- ccs/cns11643-plane2.c (revision 603239) ++++ ccs/cns11643-plane2.c (working copy) +@@ -4506,7 +4506,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cns11643_plane2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp037.c +=================================================================== +--- ccs/cp037.c (revision 603239) ++++ ccs/cp037.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp037) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp038.c +=================================================================== +--- ccs/cp038.c (revision 603239) ++++ ccs/cp038.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp038) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10000.c +=================================================================== +--- ccs/cp10000.c (revision 603239) ++++ ccs/cp10000.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10000) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10006.c +=================================================================== +--- ccs/cp10006.c (revision 603239) ++++ ccs/cp10006.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10006) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10007.c +=================================================================== +--- ccs/cp10007.c (revision 603239) ++++ ccs/cp10007.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10007) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10029.c +=================================================================== +--- ccs/cp10029.c (revision 603239) ++++ ccs/cp10029.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10029) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp1006.c +=================================================================== +--- ccs/cp1006.c (revision 603239) ++++ ccs/cp1006.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp1006) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10079.c +=================================================================== +--- ccs/cp10079.c (revision 603239) ++++ ccs/cp10079.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10079) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp10081.c +=================================================================== +--- ccs/cp10081.c (revision 603239) ++++ ccs/cp10081.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp10081) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp1026.c +=================================================================== +--- ccs/cp1026.c (revision 603239) ++++ ccs/cp1026.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp1026) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp273.c +=================================================================== +--- ccs/cp273.c (revision 603239) ++++ ccs/cp273.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp273) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp274.c +=================================================================== +--- ccs/cp274.c (revision 603239) ++++ ccs/cp274.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp274) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp275.c +=================================================================== +--- ccs/cp275.c (revision 603239) ++++ ccs/cp275.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp275) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp277.c +=================================================================== +--- ccs/cp277.c (revision 603239) ++++ ccs/cp277.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp277) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp278.c +=================================================================== +--- ccs/cp278.c (revision 603239) ++++ ccs/cp278.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp278) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp280.c +=================================================================== +--- ccs/cp280.c (revision 603239) ++++ ccs/cp280.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp280) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp281.c +=================================================================== +--- ccs/cp281.c (revision 603239) ++++ ccs/cp281.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp281) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp284.c +=================================================================== +--- ccs/cp284.c (revision 603239) ++++ ccs/cp284.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp284) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp285.c +=================================================================== +--- ccs/cp285.c (revision 603239) ++++ ccs/cp285.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp285) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp290.c +=================================================================== +--- ccs/cp290.c (revision 603239) ++++ ccs/cp290.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp290) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp297.c +=================================================================== +--- ccs/cp297.c (revision 603239) ++++ ccs/cp297.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp297) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp420.c +=================================================================== +--- ccs/cp420.c (revision 603239) ++++ ccs/cp420.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp420) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp423.c +=================================================================== +--- ccs/cp423.c (revision 603239) ++++ ccs/cp423.c (working copy) +@@ -221,7 +221,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp423) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp424.c +=================================================================== +--- ccs/cp424.c (revision 603239) ++++ ccs/cp424.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp424) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp437.c +=================================================================== +--- ccs/cp437.c (revision 603239) ++++ ccs/cp437.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp437) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp500.c +=================================================================== +--- ccs/cp500.c (revision 603239) ++++ ccs/cp500.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp500) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp737.c +=================================================================== +--- ccs/cp737.c (revision 603239) ++++ ccs/cp737.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp737) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp775.c +=================================================================== +--- ccs/cp775.c (revision 603239) ++++ ccs/cp775.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp775) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp850.c +=================================================================== +--- ccs/cp850.c (revision 603239) ++++ ccs/cp850.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp850) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp851.c +=================================================================== +--- ccs/cp851.c (revision 603239) ++++ ccs/cp851.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp851) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp852.c +=================================================================== +--- ccs/cp852.c (revision 603239) ++++ ccs/cp852.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp852) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp855.c +=================================================================== +--- ccs/cp855.c (revision 603239) ++++ ccs/cp855.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp855) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp856.c +=================================================================== +--- ccs/cp856.c (revision 603239) ++++ ccs/cp856.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp856) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp857.c +=================================================================== +--- ccs/cp857.c (revision 603239) ++++ ccs/cp857.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp857) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp860.c +=================================================================== +--- ccs/cp860.c (revision 603239) ++++ ccs/cp860.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp860) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp861.c +=================================================================== +--- ccs/cp861.c (revision 603239) ++++ ccs/cp861.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp861) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp862.c +=================================================================== +--- ccs/cp862.c (revision 603239) ++++ ccs/cp862.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp862) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp863.c +=================================================================== +--- ccs/cp863.c (revision 603239) ++++ ccs/cp863.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp863) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp864.c +=================================================================== +--- ccs/cp864.c (revision 603239) ++++ ccs/cp864.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp864) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp865.c +=================================================================== +--- ccs/cp865.c (revision 603239) ++++ ccs/cp865.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp865) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp866.c +=================================================================== +--- ccs/cp866.c (revision 603239) ++++ ccs/cp866.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp866) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp868.c +=================================================================== +--- ccs/cp868.c (revision 603239) ++++ ccs/cp868.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp868) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp869.c +=================================================================== +--- ccs/cp869.c (revision 603239) ++++ ccs/cp869.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp869) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp870.c +=================================================================== +--- ccs/cp870.c (revision 603239) ++++ ccs/cp870.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp870) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp871.c +=================================================================== +--- ccs/cp871.c (revision 603239) ++++ ccs/cp871.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp871) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp874.c +=================================================================== +--- ccs/cp874.c (revision 603239) ++++ ccs/cp874.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp874) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp875.c +=================================================================== +--- ccs/cp875.c (revision 603239) ++++ ccs/cp875.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp875) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp880.c +=================================================================== +--- ccs/cp880.c (revision 603239) ++++ ccs/cp880.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp880) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp891.c +=================================================================== +--- ccs/cp891.c (revision 603239) ++++ ccs/cp891.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp891) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp903.c +=================================================================== +--- ccs/cp903.c (revision 603239) ++++ ccs/cp903.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp903) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp904.c +=================================================================== +--- ccs/cp904.c (revision 603239) ++++ ccs/cp904.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp904) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp905.c +=================================================================== +--- ccs/cp905.c (revision 603239) ++++ ccs/cp905.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp905) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp918.c +=================================================================== +--- ccs/cp918.c (revision 603239) ++++ ccs/cp918.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp918) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp932.c +=================================================================== +--- ccs/cp932.c (revision 603239) ++++ ccs/cp932.c (working copy) +@@ -5134,7 +5134,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp932) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp936.c +=================================================================== +--- ccs/cp936.c (revision 603239) ++++ ccs/cp936.c (working copy) +@@ -8109,7 +8109,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp936) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp949.c +=================================================================== +--- ccs/cp949.c (revision 603239) ++++ ccs/cp949.c (working copy) +@@ -9544,7 +9544,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp949) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/cp950.c +=================================================================== +--- ccs/cp950.c (revision 603239) ++++ ccs/cp950.c (working copy) +@@ -6569,7 +6569,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(cp950) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/dec-mcs.c +=================================================================== +--- ccs/dec-mcs.c (revision 603239) ++++ ccs/dec-mcs.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(dec_mcs) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-at-de-a.c +=================================================================== +--- ccs/ebcdic-at-de-a.c (revision 603239) ++++ ccs/ebcdic-at-de-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_at_de_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-at-de.c +=================================================================== +--- ccs/ebcdic-at-de.c (revision 603239) ++++ ccs/ebcdic-at-de.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_at_de) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-ca-fr.c +=================================================================== +--- ccs/ebcdic-ca-fr.c (revision 603239) ++++ ccs/ebcdic-ca-fr.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_ca_fr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-dk-no-a.c +=================================================================== +--- ccs/ebcdic-dk-no-a.c (revision 603239) ++++ ccs/ebcdic-dk-no-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_dk_no_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-dk-no.c +=================================================================== +--- ccs/ebcdic-dk-no.c (revision 603239) ++++ ccs/ebcdic-dk-no.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_dk_no) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es-a.c +=================================================================== +--- ccs/ebcdic-es-a.c (revision 603239) ++++ ccs/ebcdic-es-a.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es-s.c +=================================================================== +--- ccs/ebcdic-es-s.c (revision 603239) ++++ ccs/ebcdic-es-s.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es_s) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-es.c +=================================================================== +--- ccs/ebcdic-es.c (revision 603239) ++++ ccs/ebcdic-es.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_es) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fi-se-a.c +=================================================================== +--- ccs/ebcdic-fi-se-a.c (revision 603239) ++++ ccs/ebcdic-fi-se-a.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fi_se_a) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fi-se.c +=================================================================== +--- ccs/ebcdic-fi-se.c (revision 603239) ++++ ccs/ebcdic-fi-se.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fi_se) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-fr.c +=================================================================== +--- ccs/ebcdic-fr.c (revision 603239) ++++ ccs/ebcdic-fr.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_fr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-it.c +=================================================================== +--- ccs/ebcdic-it.c (revision 603239) ++++ ccs/ebcdic-it.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_it) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-pt.c +=================================================================== +--- ccs/ebcdic-pt.c (revision 603239) ++++ ccs/ebcdic-pt.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_pt) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-uk.c +=================================================================== +--- ccs/ebcdic-uk.c (revision 603239) ++++ ccs/ebcdic-uk.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_uk) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ebcdic-us.c +=================================================================== +--- ccs/ebcdic-us.c (revision 603239) ++++ ccs/ebcdic-us.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ebcdic_us) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/gb12345.c +=================================================================== +--- ccs/gb12345.c (revision 603239) ++++ ccs/gb12345.c (working copy) +@@ -5085,7 +5085,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb12345) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/gb_2312-80.c +=================================================================== +--- ccs/gb_2312-80.c (revision 603239) ++++ ccs/gb_2312-80.c (working copy) +@@ -5012,7 +5012,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb_2312_80) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/hp-roman8.c +=================================================================== +--- ccs/hp-roman8.c (revision 603239) ++++ ccs/hp-roman8.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(hp_roman8) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-1.c +=================================================================== +--- ccs/iso-8859-1.c (revision 603239) ++++ ccs/iso-8859-1.c (working copy) +@@ -129,7 +129,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-10.c +=================================================================== +--- ccs/iso-8859-10.c (revision 603239) ++++ ccs/iso-8859-10.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_10) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-13.c +=================================================================== +--- ccs/iso-8859-13.c (revision 603239) ++++ ccs/iso-8859-13.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_13) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-14.c +=================================================================== +--- ccs/iso-8859-14.c (revision 603239) ++++ ccs/iso-8859-14.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-15.c +=================================================================== +--- ccs/iso-8859-15.c (revision 603239) ++++ ccs/iso-8859-15.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-2.c +=================================================================== +--- ccs/iso-8859-2.c (revision 603239) ++++ ccs/iso-8859-2.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-3.c +=================================================================== +--- ccs/iso-8859-3.c (revision 603239) ++++ ccs/iso-8859-3.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_3) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-4.c +=================================================================== +--- ccs/iso-8859-4.c (revision 603239) ++++ ccs/iso-8859-4.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_4) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-5.c +=================================================================== +--- ccs/iso-8859-5.c (revision 603239) ++++ ccs/iso-8859-5.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_5) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-6.c +=================================================================== +--- ccs/iso-8859-6.c (revision 603239) ++++ ccs/iso-8859-6.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_6) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-7.c +=================================================================== +--- ccs/iso-8859-7.c (revision 603239) ++++ ccs/iso-8859-7.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_7) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-8.c +=================================================================== +--- ccs/iso-8859-8.c (revision 603239) ++++ ccs/iso-8859-8.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_8) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-8859-9.c +=================================================================== +--- ccs/iso-8859-9.c (revision 603239) ++++ ccs/iso-8859-9.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_8859_9) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-10.c +=================================================================== +--- ccs/iso-ir-10.c (revision 603239) ++++ ccs/iso-ir-10.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_10) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-102.c +=================================================================== +--- ccs/iso-ir-102.c (revision 603239) ++++ ccs/iso-ir-102.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_102) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-103.c +=================================================================== +--- ccs/iso-ir-103.c (revision 603239) ++++ ccs/iso-ir-103.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_103) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-11.c +=================================================================== +--- ccs/iso-ir-11.c (revision 603239) ++++ ccs/iso-ir-11.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_11) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-111.c +=================================================================== +--- ccs/iso-ir-111.c (revision 603239) ++++ ccs/iso-ir-111.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_111) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-121.c +=================================================================== +--- ccs/iso-ir-121.c (revision 603239) ++++ ccs/iso-ir-121.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_121) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-122.c +=================================================================== +--- ccs/iso-ir-122.c (revision 603239) ++++ ccs/iso-ir-122.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_122) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-123.c +=================================================================== +--- ccs/iso-ir-123.c (revision 603239) ++++ ccs/iso-ir-123.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_123) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-128.c +=================================================================== +--- ccs/iso-ir-128.c (revision 603239) ++++ ccs/iso-ir-128.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_128) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-13.c +=================================================================== +--- ccs/iso-ir-13.c (revision 603239) ++++ ccs/iso-ir-13.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_13) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-139.c +=================================================================== +--- ccs/iso-ir-139.c (revision 603239) ++++ ccs/iso-ir-139.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_139) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-14.c +=================================================================== +--- ccs/iso-ir-14.c (revision 603239) ++++ ccs/iso-ir-14.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_14) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-141.c +=================================================================== +--- ccs/iso-ir-141.c (revision 603239) ++++ ccs/iso-ir-141.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_141) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-142.c +=================================================================== +--- ccs/iso-ir-142.c (revision 603239) ++++ ccs/iso-ir-142.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_142) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-143.c +=================================================================== +--- ccs/iso-ir-143.c (revision 603239) ++++ ccs/iso-ir-143.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_143) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-146.c +=================================================================== +--- ccs/iso-ir-146.c (revision 603239) ++++ ccs/iso-ir-146.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_146) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-147.c +=================================================================== +--- ccs/iso-ir-147.c (revision 603239) ++++ ccs/iso-ir-147.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_147) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-15.c +=================================================================== +--- ccs/iso-ir-15.c (revision 603239) ++++ ccs/iso-ir-15.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-150.c +=================================================================== +--- ccs/iso-ir-150.c (revision 603239) ++++ ccs/iso-ir-150.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_150) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-151.c +=================================================================== +--- ccs/iso-ir-151.c (revision 603239) ++++ ccs/iso-ir-151.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_151) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-152.c +=================================================================== +--- ccs/iso-ir-152.c (revision 603239) ++++ ccs/iso-ir-152.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_152) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-153.c +=================================================================== +--- ccs/iso-ir-153.c (revision 603239) ++++ ccs/iso-ir-153.c (working copy) +@@ -164,7 +164,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_153) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-154.c +=================================================================== +--- ccs/iso-ir-154.c (revision 603239) ++++ ccs/iso-ir-154.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_154) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-155.c +=================================================================== +--- ccs/iso-ir-155.c (revision 603239) ++++ ccs/iso-ir-155.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_155) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-158.c +=================================================================== +--- ccs/iso-ir-158.c (revision 603239) ++++ ccs/iso-ir-158.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_158) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-16.c +=================================================================== +--- ccs/iso-ir-16.c (revision 603239) ++++ ccs/iso-ir-16.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_16) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-17.c +=================================================================== +--- ccs/iso-ir-17.c (revision 603239) ++++ ccs/iso-ir-17.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_17) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-18.c +=================================================================== +--- ccs/iso-ir-18.c (revision 603239) ++++ ccs/iso-ir-18.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_18) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-19.c +=================================================================== +--- ccs/iso-ir-19.c (revision 603239) ++++ ccs/iso-ir-19.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_19) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-2.c +=================================================================== +--- ccs/iso-ir-2.c (revision 603239) ++++ ccs/iso-ir-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-21.c +=================================================================== +--- ccs/iso-ir-21.c (revision 603239) ++++ ccs/iso-ir-21.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_21) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-25.c +=================================================================== +--- ccs/iso-ir-25.c (revision 603239) ++++ ccs/iso-ir-25.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_25) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-27.c +=================================================================== +--- ccs/iso-ir-27.c (revision 603239) ++++ ccs/iso-ir-27.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_27) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-37.c +=================================================================== +--- ccs/iso-ir-37.c (revision 603239) ++++ ccs/iso-ir-37.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_37) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-4.c +=================================================================== +--- ccs/iso-ir-4.c (revision 603239) ++++ ccs/iso-ir-4.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_4) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-47.c +=================================================================== +--- ccs/iso-ir-47.c (revision 603239) ++++ ccs/iso-ir-47.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_47) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-49.c +=================================================================== +--- ccs/iso-ir-49.c (revision 603239) ++++ ccs/iso-ir-49.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_49) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-50.c +=================================================================== +--- ccs/iso-ir-50.c (revision 603239) ++++ ccs/iso-ir-50.c (working copy) +@@ -288,7 +288,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_50) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-51.c +=================================================================== +--- ccs/iso-ir-51.c (revision 603239) ++++ ccs/iso-ir-51.c (working copy) +@@ -288,7 +288,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_51) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-54.c +=================================================================== +--- ccs/iso-ir-54.c (revision 603239) ++++ ccs/iso-ir-54.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_54) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-55.c +=================================================================== +--- ccs/iso-ir-55.c (revision 603239) ++++ ccs/iso-ir-55.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_55) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-57.c +=================================================================== +--- ccs/iso-ir-57.c (revision 603239) ++++ ccs/iso-ir-57.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_57) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-60.c +=================================================================== +--- ccs/iso-ir-60.c (revision 603239) ++++ ccs/iso-ir-60.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_60) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-61.c +=================================================================== +--- ccs/iso-ir-61.c (revision 603239) ++++ ccs/iso-ir-61.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_61) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-69.c +=================================================================== +--- ccs/iso-ir-69.c (revision 603239) ++++ ccs/iso-ir-69.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_69) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-70.c +=================================================================== +--- ccs/iso-ir-70.c (revision 603239) ++++ ccs/iso-ir-70.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_70) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-8-1.c +=================================================================== +--- ccs/iso-ir-8-1.c (revision 603239) ++++ ccs/iso-ir-8-1.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_8_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-8-2.c +=================================================================== +--- ccs/iso-ir-8-2.c (revision 603239) ++++ ccs/iso-ir-8-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_8_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-84.c +=================================================================== +--- ccs/iso-ir-84.c (revision 603239) ++++ ccs/iso-ir-84.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_84) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-85.c +=================================================================== +--- ccs/iso-ir-85.c (revision 603239) ++++ ccs/iso-ir-85.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_85) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-86.c +=================================================================== +--- ccs/iso-ir-86.c (revision 603239) ++++ ccs/iso-ir-86.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_86) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-88.c +=================================================================== +--- ccs/iso-ir-88.c (revision 603239) ++++ ccs/iso-ir-88.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_88) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-89.c +=================================================================== +--- ccs/iso-ir-89.c (revision 603239) ++++ ccs/iso-ir-89.c (working copy) +@@ -183,7 +183,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_89) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-9-1.c +=================================================================== +--- ccs/iso-ir-9-1.c (revision 603239) ++++ ccs/iso-ir-9-1.c (working copy) +@@ -218,7 +218,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_9_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-9-2.c +=================================================================== +--- ccs/iso-ir-9-2.c (revision 603239) ++++ ccs/iso-ir-9-2.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_9_2) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-90.c +=================================================================== +--- ccs/iso-ir-90.c (revision 603239) ++++ ccs/iso-ir-90.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_90) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-91.c +=================================================================== +--- ccs/iso-ir-91.c (revision 603239) ++++ ccs/iso-ir-91.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_91) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-92.c +=================================================================== +--- ccs/iso-ir-92.c (revision 603239) ++++ ccs/iso-ir-92.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_92) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-93.c +=================================================================== +--- ccs/iso-ir-93.c (revision 603239) ++++ ccs/iso-ir-93.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_93) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-94.c +=================================================================== +--- ccs/iso-ir-94.c (revision 603239) ++++ ccs/iso-ir-94.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_94) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-95.c +=================================================================== +--- ccs/iso-ir-95.c (revision 603239) ++++ ccs/iso-ir-95.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_95) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-96.c +=================================================================== +--- ccs/iso-ir-96.c (revision 603239) ++++ ccs/iso-ir-96.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_96) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-98.c +=================================================================== +--- ccs/iso-ir-98.c (revision 603239) ++++ ccs/iso-ir-98.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_98) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso-ir-99.c +=================================================================== +--- ccs/iso-ir-99.c (revision 603239) ++++ ccs/iso-ir-99.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_ir_99) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso646-dk.c +=================================================================== +--- ccs/iso646-dk.c (revision 603239) ++++ ccs/iso646-dk.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso646_dk) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/iso646-kr.c +=================================================================== +--- ccs/iso646-kr.c (revision 603239) ++++ ccs/iso646-kr.c (working copy) +@@ -148,7 +148,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso646_kr) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0201.c +=================================================================== +--- ccs/jis_x0201.c (revision 603239) ++++ ccs/jis_x0201.c (working copy) +@@ -199,7 +199,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0201) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0208-1983.c +=================================================================== +--- ccs/jis_x0208-1983.c (revision 603239) ++++ ccs/jis_x0208-1983.c (working copy) +@@ -4796,7 +4796,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0208_1983) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/jis_x0212-1990.c +=================================================================== +--- ccs/jis_x0212-1990.c (revision 603239) ++++ ccs/jis_x0212-1990.c (working copy) +@@ -4450,7 +4450,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(jis_x0212_1990) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/johab.c +=================================================================== +--- ccs/johab.c (revision 603239) ++++ ccs/johab.c (working copy) +@@ -9124,7 +9124,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(johab) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-r.c +=================================================================== +--- ccs/koi8-r.c (revision 603239) ++++ ccs/koi8-r.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_r) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-ru.c +=================================================================== +--- ccs/koi8-ru.c (revision 603239) ++++ ccs/koi8-ru.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_ru) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/koi8-u.c +=================================================================== +--- ccs/koi8-u.c (revision 603239) ++++ ccs/koi8-u.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(koi8_u) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/ksx1001.c +=================================================================== +--- ccs/ksx1001.c (revision 603239) ++++ ccs/ksx1001.c (working copy) +@@ -6844,7 +6844,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ksx1001) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-ce.c +=================================================================== +--- ccs/mac-ce.c (revision 603239) ++++ ccs/mac-ce.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_ce) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-croatian.c +=================================================================== +--- ccs/mac-croatian.c (revision 603239) ++++ ccs/mac-croatian.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_croatian) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-cyrillic.c +=================================================================== +--- ccs/mac-cyrillic.c (revision 603239) ++++ ccs/mac-cyrillic.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_cyrillic) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-dingbats.c +=================================================================== +--- ccs/mac-dingbats.c (revision 603239) ++++ ccs/mac-dingbats.c (working copy) +@@ -374,7 +374,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_dingbats) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-greek.c +=================================================================== +--- ccs/mac-greek.c (revision 603239) ++++ ccs/mac-greek.c (working copy) +@@ -339,7 +339,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_greek) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-iceland.c +=================================================================== +--- ccs/mac-iceland.c (revision 603239) ++++ ccs/mac-iceland.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_iceland) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-japan.c +=================================================================== +--- ccs/mac-japan.c (revision 603239) ++++ ccs/mac-japan.c (working copy) +@@ -5169,7 +5169,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_japan) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-roman.c +=================================================================== +--- ccs/mac-roman.c (revision 603239) ++++ ccs/mac-roman.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_roman) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-romania.c +=================================================================== +--- ccs/mac-romania.c (revision 603239) ++++ ccs/mac-romania.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_romania) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-thai.c +=================================================================== +--- ccs/mac-thai.c (revision 603239) ++++ ccs/mac-thai.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_thai) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-turkish.c +=================================================================== +--- ccs/mac-turkish.c (revision 603239) ++++ ccs/mac-turkish.c (working copy) +@@ -409,7 +409,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_turkish) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/mac-ukraine.c +=================================================================== +--- ccs/mac-ukraine.c (revision 603239) ++++ ccs/mac-ukraine.c (working copy) +@@ -78,7 +78,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(mac_ukraine) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/macintosh.c +=================================================================== +--- ccs/macintosh.c (revision 603239) ++++ ccs/macintosh.c (working copy) +@@ -444,7 +444,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(macintosh) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/osd_ebcdic_df04_1.c +=================================================================== +--- ccs/osd_ebcdic_df04_1.c (revision 603239) ++++ ccs/osd_ebcdic_df04_1.c (working copy) +@@ -140,7 +140,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(osd_ebcdic_df04_1) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/osd_ebcdic_df04_15.c +=================================================================== +--- ccs/osd_ebcdic_df04_15.c (revision 603239) ++++ ccs/osd_ebcdic_df04_15.c (working copy) +@@ -210,7 +210,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(osd_ebcdic_df04_15) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/shift_jis.c +=================================================================== +--- ccs/shift_jis.c (revision 603239) ++++ ccs/shift_jis.c (working copy) +@@ -4749,7 +4749,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(shift_jis) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/us-ascii.c +=================================================================== +--- ccs/us-ascii.c (revision 603239) ++++ ccs/us-ascii.c (working copy) +@@ -113,7 +113,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(us_ascii) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1250.c +=================================================================== +--- ccs/windows-1250.c (revision 603239) ++++ ccs/windows-1250.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1250) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1251.c +=================================================================== +--- ccs/windows-1251.c (revision 603239) ++++ ccs/windows-1251.c (working copy) +@@ -234,7 +234,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1251) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1252.c +=================================================================== +--- ccs/windows-1252.c (revision 603239) ++++ ccs/windows-1252.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1252) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1253.c +=================================================================== +--- ccs/windows-1253.c (revision 603239) ++++ ccs/windows-1253.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1253) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1254.c +=================================================================== +--- ccs/windows-1254.c (revision 603239) ++++ ccs/windows-1254.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1254) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1255.c +=================================================================== +--- ccs/windows-1255.c (revision 603239) ++++ ccs/windows-1255.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1255) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1256.c +=================================================================== +--- ccs/windows-1256.c (revision 603239) ++++ ccs/windows-1256.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1256) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1257.c +=================================================================== +--- ccs/windows-1257.c (revision 603239) ++++ ccs/windows-1257.c (working copy) +@@ -269,7 +269,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1257) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ccs/windows-1258.c +=================================================================== +--- ccs/windows-1258.c (revision 603239) ++++ ccs/windows-1258.c (working copy) +@@ -304,7 +304,7 @@ + convert_from_ucs, convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(windows_1258) = { + ICMOD_UC_CCS, + apr_iconv_mod_noevent, + NULL, +Index: ces/_tbl_simple.c +=================================================================== +--- ces/_tbl_simple.c (revision 603239) ++++ ces/_tbl_simple.c (working copy) +@@ -176,7 +176,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(_tbl_simple) = { + ICMOD_UC_CES, + table_event, + NULL, +Index: ces/euc-jp.c +=================================================================== +--- ces/euc-jp.c (revision 603239) ++++ ces/euc-jp.c (working copy) +@@ -72,7 +72,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_jp) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/euc-kr.c +=================================================================== +--- ces/euc-kr.c (revision 603239) ++++ ces/euc-kr.c (working copy) +@@ -65,7 +65,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_kr) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/euc-tw.c +=================================================================== +--- ces/euc-tw.c (revision 603239) ++++ ces/euc-tw.c (working copy) +@@ -69,7 +69,7 @@ + apr_iconv_euc_convert_to_ucs, + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(euc_tw) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/gb2312.c +=================================================================== +--- ces/gb2312.c (revision 603239) ++++ ces/gb2312.c (working copy) +@@ -65,7 +65,7 @@ + apr_iconv_euc_convert_to_ucs + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(gb2312) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-10646-ucs-2.c +=================================================================== +--- ces/iso-10646-ucs-2.c (revision 603239) ++++ ces/iso-10646-ucs-2.c (working copy) +@@ -30,9 +30,10 @@ + * iconv (Charset Conversion Library) v1.0 + */ + ++#include <stdlib.h> /* free, malloc */ ++ + #define ICONV_INTERNAL + #include "iconv.h" +-#include <stdlib.h> /* free, malloc */ + + static const char * const names[] = { + "iso-10646-ucs-2", "csUnicode", "ucs-2", NULL +@@ -58,7 +59,7 @@ + bytes = *state ? 2 : 4; + if (*outbytesleft < bytes) + return 0; /* No space in the output buffer */ +- if (*state == 0) { ++ if (*state) { + *(*outbuf)++ = 0xFE; + *(*outbuf)++ = 0xFF; + *state = 1; +@@ -125,7 +126,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_10646_ucs_2) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/iso-10646-ucs-4.c +=================================================================== +--- ces/iso-10646-ucs-4.c (revision 603239) ++++ ces/iso-10646-ucs-4.c (working copy) +@@ -30,11 +30,11 @@ + * iconv (Charset Conversion Library) v1.0 + */ + ++#include <stdlib.h> /* free, malloc */ ++ + #define ICONV_INTERNAL + #include "iconv.h" +-#include <stdlib.h> /* free, malloc */ + +- + static const char * const names[] = { + "iso-10646-ucs-2", "ucs-4", "ucs4", NULL + }; +@@ -130,7 +130,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_10646_ucs_4) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/iso-2022-cn.c +=================================================================== +--- ces/iso-2022-cn.c (revision 603239) ++++ ces/iso-2022-cn.c (working copy) +@@ -72,7 +72,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_cn) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-jp-2.c +=================================================================== +--- ces/iso-2022-jp-2.c (revision 603239) ++++ ces/iso-2022-jp-2.c (working copy) +@@ -84,7 +84,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_jp_2) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-jp.c +=================================================================== +--- ces/iso-2022-jp.c (revision 603239) ++++ ces/iso-2022-jp.c (working copy) +@@ -74,7 +74,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_jp) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/iso-2022-kr.c +=================================================================== +--- ces/iso-2022-kr.c (revision 603239) ++++ ces/iso-2022-kr.c (working copy) +@@ -69,7 +69,7 @@ + shift_tab + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(iso_2022_kr) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + iconv_module_depend, +Index: ces/ucs2-internal.c +=================================================================== +--- ces/ucs2-internal.c (revision 603239) ++++ ces/ucs2-internal.c (working copy) +@@ -90,7 +90,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ucs2_internal) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/ucs4-internal.c +=================================================================== +--- ces/ucs4-internal.c (revision 603239) ++++ ces/ucs4-internal.c (working copy) +@@ -88,7 +88,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(ucs4_internal) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/unicode-1-1-utf-7.c +=================================================================== +--- ces/unicode-1-1-utf-7.c (revision 603239) ++++ ces/unicode-1-1-utf-7.c (working copy) +@@ -295,7 +295,7 @@ + convert_to_ucs, NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(unicode_1_1_utf_7) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/utf-16.c +=================================================================== +--- ces/utf-16.c (revision 603239) ++++ ces/utf-16.c (working copy) +@@ -147,7 +147,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(utf_16) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: ces/utf-8.c +=================================================================== +--- ces/utf-8.c (revision 603239) ++++ ces/utf-8.c (working copy) +@@ -150,7 +150,7 @@ + NULL + }; + +-struct iconv_module_desc iconv_module = { ++API_DECLARE_MODULE(utf_8) = { + ICMOD_UC_CES, + apr_iconv_mod_noevent, + NULL, +Index: lib/iconv.h +=================================================================== +--- lib/iconv.h (revision 603239) ++++ lib/iconv.h (working copy) +@@ -130,6 +130,8 @@ + iconv_conv_t * icd_conv; + }; + ++typedef struct iconv_module_desc iconv_module_desc_t; ++ + struct iconv_converter { + struct iconv_converter_desc *ic_desc; + void * ic_data; +@@ -348,7 +350,6 @@ + + extern struct iconv_converter_desc iconv_uc_desc; + +- + API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_open(struct iconv_ces *ces, apr_pool_t *ctx); + API_DECLARE_NONSTD(apr_status_t) apr_iconv_euc_close(struct iconv_ces *ces); + API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_euc_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); +@@ -360,6 +361,17 @@ + API_DECLARE_NONSTD(apr_ssize_t) apr_iconv_iso2022_convert_from_ucs(struct iconv_ces *ces, ucs_t in, unsigned char **outbuf, apr_size_t *outbytesleft); + API_DECLARE_NONSTD(ucs_t) apr_iconv_iso2022_convert_to_ucs(struct iconv_ces *ces, const unsigned char **inbuf, apr_size_t *inbytesleft); + ++#ifdef API_MODULE_STATIC ++#define API_DECLARE_MODULE(M) iconv_module_desc_t M##_iconv_module ++#define API_IMPORT_MODULE(M) extern iconv_module_desc_t M##_iconv_module ++#define API_USE_MODULE(M) 1, &M##_iconv_module ++#else ++#define API_DECLARE_MODULE(M) iconv_module_desc_t iconv_module ++#define API_IMPORT_MODULE(M) ++#define API_USE_MODULE(M) 0, NULL ++ ++#endif ++ + #endif /* ICONV_INTERNAL */ + + #endif /* _ICONV_H_ */ +Index: lib/iconv_module.c +=================================================================== +--- lib/iconv_module.c (revision 603239) ++++ lib/iconv_module.c (working copy) +@@ -52,6 +52,510 @@ + + #define APR_ICONV_PATH "APR_ICONV" API_STRINGIFY(API_MAJOR_VERSION) "_PATH" + ++API_IMPORT_MODULE(_tbl_simple); ++API_IMPORT_MODULE(adobe_stdenc); ++API_IMPORT_MODULE(adobe_symbol); ++API_IMPORT_MODULE(adobe_zdingbats); ++API_IMPORT_MODULE(big5); ++API_IMPORT_MODULE(cns11643_plane1); ++API_IMPORT_MODULE(cns11643_plane14); ++API_IMPORT_MODULE(cns11643_plane2); ++API_IMPORT_MODULE(cp037); ++API_IMPORT_MODULE(cp038); ++API_IMPORT_MODULE(cp10000); ++API_IMPORT_MODULE(cp10006); ++API_IMPORT_MODULE(cp10007); ++API_IMPORT_MODULE(cp10029); ++API_IMPORT_MODULE(cp1006); ++API_IMPORT_MODULE(cp10079); ++API_IMPORT_MODULE(cp10081); ++API_IMPORT_MODULE(cp1026); ++API_IMPORT_MODULE(cp273); ++API_IMPORT_MODULE(cp274); ++API_IMPORT_MODULE(cp275); ++API_IMPORT_MODULE(cp277); ++API_IMPORT_MODULE(cp278); ++API_IMPORT_MODULE(cp280); ++API_IMPORT_MODULE(cp281); ++API_IMPORT_MODULE(cp284); ++API_IMPORT_MODULE(cp285); ++API_IMPORT_MODULE(cp290); ++API_IMPORT_MODULE(cp297); ++API_IMPORT_MODULE(cp420); ++API_IMPORT_MODULE(cp423); ++API_IMPORT_MODULE(cp424); ++API_IMPORT_MODULE(cp437); ++API_IMPORT_MODULE(cp500); ++API_IMPORT_MODULE(cp737); ++API_IMPORT_MODULE(cp775); ++API_IMPORT_MODULE(cp850); ++API_IMPORT_MODULE(cp851); ++API_IMPORT_MODULE(cp852); ++API_IMPORT_MODULE(cp855); ++API_IMPORT_MODULE(cp856); ++API_IMPORT_MODULE(cp857); ++API_IMPORT_MODULE(cp860); ++API_IMPORT_MODULE(cp861); ++API_IMPORT_MODULE(cp862); ++API_IMPORT_MODULE(cp863); ++API_IMPORT_MODULE(cp864); ++API_IMPORT_MODULE(cp865); ++API_IMPORT_MODULE(cp866); ++API_IMPORT_MODULE(cp868); ++API_IMPORT_MODULE(cp869); ++API_IMPORT_MODULE(cp870); ++API_IMPORT_MODULE(cp871); ++API_IMPORT_MODULE(cp874); ++API_IMPORT_MODULE(cp875); ++API_IMPORT_MODULE(cp880); ++API_IMPORT_MODULE(cp891); ++API_IMPORT_MODULE(cp903); ++API_IMPORT_MODULE(cp904); ++API_IMPORT_MODULE(cp905); ++API_IMPORT_MODULE(cp918); ++API_IMPORT_MODULE(cp932); ++API_IMPORT_MODULE(cp936); ++API_IMPORT_MODULE(cp949); ++API_IMPORT_MODULE(cp950); ++API_IMPORT_MODULE(dec_mcs); ++API_IMPORT_MODULE(ebcdic_at_de); ++API_IMPORT_MODULE(ebcdic_at_de_a); ++API_IMPORT_MODULE(ebcdic_ca_fr); ++API_IMPORT_MODULE(ebcdic_dk_no); ++API_IMPORT_MODULE(ebcdic_dk_no_a); ++API_IMPORT_MODULE(ebcdic_es); ++API_IMPORT_MODULE(ebcdic_es_a); ++API_IMPORT_MODULE(ebcdic_es_s); ++API_IMPORT_MODULE(ebcdic_fi_se); ++API_IMPORT_MODULE(ebcdic_fi_se_a); ++API_IMPORT_MODULE(ebcdic_fr); ++API_IMPORT_MODULE(ebcdic_it); ++API_IMPORT_MODULE(ebcdic_pt); ++API_IMPORT_MODULE(ebcdic_uk); ++API_IMPORT_MODULE(ebcdic_us); ++API_IMPORT_MODULE(euc_jp); ++API_IMPORT_MODULE(euc_kr); ++API_IMPORT_MODULE(euc_tw); ++API_IMPORT_MODULE(gb12345); ++API_IMPORT_MODULE(gb2312); ++API_IMPORT_MODULE(gb_2312_80); ++API_IMPORT_MODULE(hp_roman8); ++API_IMPORT_MODULE(iso646_dk); ++API_IMPORT_MODULE(iso646_kr); ++API_IMPORT_MODULE(iso_10646_ucs_2); ++API_IMPORT_MODULE(iso_10646_ucs_4); ++API_IMPORT_MODULE(iso_2022_cn); ++API_IMPORT_MODULE(iso_2022_jp); ++API_IMPORT_MODULE(iso_2022_jp_2); ++API_IMPORT_MODULE(iso_2022_kr); ++API_IMPORT_MODULE(iso_8859_1); ++API_IMPORT_MODULE(iso_8859_10); ++API_IMPORT_MODULE(iso_8859_13); ++API_IMPORT_MODULE(iso_8859_14); ++API_IMPORT_MODULE(iso_8859_15); ++API_IMPORT_MODULE(iso_8859_2); ++API_IMPORT_MODULE(iso_8859_3); ++API_IMPORT_MODULE(iso_8859_4); ++API_IMPORT_MODULE(iso_8859_5); ++API_IMPORT_MODULE(iso_8859_6); ++API_IMPORT_MODULE(iso_8859_7); ++API_IMPORT_MODULE(iso_8859_8); ++API_IMPORT_MODULE(iso_8859_9); ++API_IMPORT_MODULE(iso_ir_10); ++API_IMPORT_MODULE(iso_ir_102); ++API_IMPORT_MODULE(iso_ir_103); ++API_IMPORT_MODULE(iso_ir_11); ++API_IMPORT_MODULE(iso_ir_111); ++API_IMPORT_MODULE(iso_ir_121); ++API_IMPORT_MODULE(iso_ir_122); ++API_IMPORT_MODULE(iso_ir_123); ++API_IMPORT_MODULE(iso_ir_128); ++API_IMPORT_MODULE(iso_ir_13); ++API_IMPORT_MODULE(iso_ir_139); ++API_IMPORT_MODULE(iso_ir_14); ++API_IMPORT_MODULE(iso_ir_141); ++API_IMPORT_MODULE(iso_ir_142); ++API_IMPORT_MODULE(iso_ir_143); ++API_IMPORT_MODULE(iso_ir_146); ++API_IMPORT_MODULE(iso_ir_147); ++API_IMPORT_MODULE(iso_ir_15); ++API_IMPORT_MODULE(iso_ir_150); ++API_IMPORT_MODULE(iso_ir_151); ++API_IMPORT_MODULE(iso_ir_152); ++API_IMPORT_MODULE(iso_ir_153); ++API_IMPORT_MODULE(iso_ir_154); ++API_IMPORT_MODULE(iso_ir_155); ++API_IMPORT_MODULE(iso_ir_158); ++API_IMPORT_MODULE(iso_ir_16); ++API_IMPORT_MODULE(iso_ir_17); ++API_IMPORT_MODULE(iso_ir_18); ++API_IMPORT_MODULE(iso_ir_19); ++API_IMPORT_MODULE(iso_ir_2); ++API_IMPORT_MODULE(iso_ir_21); ++API_IMPORT_MODULE(iso_ir_25); ++API_IMPORT_MODULE(iso_ir_27); ++API_IMPORT_MODULE(iso_ir_37); ++API_IMPORT_MODULE(iso_ir_4); ++API_IMPORT_MODULE(iso_ir_47); ++API_IMPORT_MODULE(iso_ir_49); ++API_IMPORT_MODULE(iso_ir_50); ++API_IMPORT_MODULE(iso_ir_51); ++API_IMPORT_MODULE(iso_ir_54); ++API_IMPORT_MODULE(iso_ir_55); ++API_IMPORT_MODULE(iso_ir_57); ++API_IMPORT_MODULE(iso_ir_60); ++API_IMPORT_MODULE(iso_ir_61); ++API_IMPORT_MODULE(iso_ir_69); ++API_IMPORT_MODULE(iso_ir_70); ++API_IMPORT_MODULE(iso_ir_84); ++API_IMPORT_MODULE(iso_ir_85); ++API_IMPORT_MODULE(iso_ir_86); ++API_IMPORT_MODULE(iso_ir_88); ++API_IMPORT_MODULE(iso_ir_89); ++API_IMPORT_MODULE(iso_ir_8_1); ++API_IMPORT_MODULE(iso_ir_8_2); ++API_IMPORT_MODULE(iso_ir_90); ++API_IMPORT_MODULE(iso_ir_91); ++API_IMPORT_MODULE(iso_ir_92); ++API_IMPORT_MODULE(iso_ir_93); ++API_IMPORT_MODULE(iso_ir_94); ++API_IMPORT_MODULE(iso_ir_95); ++API_IMPORT_MODULE(iso_ir_96); ++API_IMPORT_MODULE(iso_ir_98); ++API_IMPORT_MODULE(iso_ir_99); ++API_IMPORT_MODULE(iso_ir_9_1); ++API_IMPORT_MODULE(iso_ir_9_2); ++API_IMPORT_MODULE(jis_x0201); ++API_IMPORT_MODULE(jis_x0208_1983); ++API_IMPORT_MODULE(jis_x0212_1990); ++API_IMPORT_MODULE(johab); ++API_IMPORT_MODULE(koi8_r); ++API_IMPORT_MODULE(koi8_ru); ++API_IMPORT_MODULE(koi8_u); ++API_IMPORT_MODULE(ksx1001); ++API_IMPORT_MODULE(mac_ce); ++API_IMPORT_MODULE(mac_croatian); ++API_IMPORT_MODULE(mac_cyrillic); ++API_IMPORT_MODULE(mac_dingbats); ++API_IMPORT_MODULE(mac_greek); ++API_IMPORT_MODULE(mac_iceland); ++API_IMPORT_MODULE(mac_japan); ++API_IMPORT_MODULE(mac_roman); ++API_IMPORT_MODULE(mac_romania); ++API_IMPORT_MODULE(mac_thai); ++API_IMPORT_MODULE(mac_turkish); ++API_IMPORT_MODULE(mac_ukraine); ++API_IMPORT_MODULE(macintosh); ++API_IMPORT_MODULE(osd_ebcdic_df04_1); ++API_IMPORT_MODULE(osd_ebcdic_df04_15); ++API_IMPORT_MODULE(shift_jis); ++API_IMPORT_MODULE(ucs2_internal); ++API_IMPORT_MODULE(ucs4_internal); ++API_IMPORT_MODULE(unicode_1_1_utf_7); ++API_IMPORT_MODULE(us_ascii); ++API_IMPORT_MODULE(utf_16); ++API_IMPORT_MODULE(utf_8); ++API_IMPORT_MODULE(windows_1250); ++API_IMPORT_MODULE(windows_1251); ++API_IMPORT_MODULE(windows_1252); ++API_IMPORT_MODULE(windows_1253); ++API_IMPORT_MODULE(windows_1254); ++API_IMPORT_MODULE(windows_1255); ++API_IMPORT_MODULE(windows_1256); ++API_IMPORT_MODULE(windows_1257); ++API_IMPORT_MODULE(windows_1258); ++ ++static struct static_iconv_module { ++ const char *name; ++ int present; ++ iconv_module_desc_t *module; ++} const static_iconv_modules[] = { ++ { "_tbl_simple", API_USE_MODULE(_tbl_simple) }, ++ { "adobe-stdenc", API_USE_MODULE(adobe_stdenc) }, ++ { "adobe-symbol", API_USE_MODULE(adobe_symbol) }, ++ { "adobe-zdingbats", API_USE_MODULE(adobe_zdingbats) }, ++ { "big5", API_USE_MODULE(big5) }, ++ { "cns11643-plane1", API_USE_MODULE(cns11643_plane1) }, ++ { "cns11643-plane14", API_USE_MODULE(cns11643_plane14) }, ++ { "cns11643-plane2", API_USE_MODULE(cns11643_plane2) }, ++ { "cp037", API_USE_MODULE(cp037) }, ++ { "cp038", API_USE_MODULE(cp038) }, ++ { "cp10000", API_USE_MODULE(cp10000) }, ++ { "cp10006", API_USE_MODULE(cp10006) }, ++ { "cp10007", API_USE_MODULE(cp10007) }, ++ { "cp10029", API_USE_MODULE(cp10029) }, ++ { "cp1006", API_USE_MODULE(cp1006) }, ++ { "cp10079", API_USE_MODULE(cp10079) }, ++ { "cp10081", API_USE_MODULE(cp10081) }, ++ { "cp1026", API_USE_MODULE(cp1026) }, ++ { "cp273", API_USE_MODULE(cp273) }, ++ { "cp274", API_USE_MODULE(cp274) }, ++ { "cp275", API_USE_MODULE(cp275) }, ++ { "cp277", API_USE_MODULE(cp277) }, ++ { "cp278", API_USE_MODULE(cp278) }, ++ { "cp280", API_USE_MODULE(cp280) }, ++ { "cp281", API_USE_MODULE(cp281) }, ++ { "cp284", API_USE_MODULE(cp284) }, ++ { "cp285", API_USE_MODULE(cp285) }, ++ { "cp290", API_USE_MODULE(cp290) }, ++ { "cp297", API_USE_MODULE(cp297) }, ++ { "cp420", API_USE_MODULE(cp420) }, ++ { "cp423", API_USE_MODULE(cp423) }, ++ { "cp424", API_USE_MODULE(cp424) }, ++ { "cp437", API_USE_MODULE(cp437) }, ++ { "cp500", API_USE_MODULE(cp500) }, ++ { "cp737", API_USE_MODULE(cp737) }, ++ { "cp775", API_USE_MODULE(cp775) }, ++ { "cp850", API_USE_MODULE(cp850) }, ++ { "cp851", API_USE_MODULE(cp851) }, ++ { "cp852", API_USE_MODULE(cp852) }, ++ { "cp855", API_USE_MODULE(cp855) }, ++ { "cp856", API_USE_MODULE(cp856) }, ++ { "cp857", API_USE_MODULE(cp857) }, ++ { "cp860", API_USE_MODULE(cp860) }, ++ { "cp861", API_USE_MODULE(cp861) }, ++ { "cp862", API_USE_MODULE(cp862) }, ++ { "cp863", API_USE_MODULE(cp863) }, ++ { "cp864", API_USE_MODULE(cp864) }, ++ { "cp865", API_USE_MODULE(cp865) }, ++ { "cp866", API_USE_MODULE(cp866) }, ++ { "cp868", API_USE_MODULE(cp868) }, ++ { "cp869", API_USE_MODULE(cp869) }, ++ { "cp870", API_USE_MODULE(cp870) }, ++ { "cp871", API_USE_MODULE(cp871) }, ++ { "cp874", API_USE_MODULE(cp874) }, ++ { "cp875", API_USE_MODULE(cp875) }, ++ { "cp880", API_USE_MODULE(cp880) }, ++ { "cp891", API_USE_MODULE(cp891) }, ++ { "cp903", API_USE_MODULE(cp903) }, ++ { "cp904", API_USE_MODULE(cp904) }, ++ { "cp905", API_USE_MODULE(cp905) }, ++ { "cp918", API_USE_MODULE(cp918) }, ++ { "cp932", API_USE_MODULE(cp932) }, ++ { "cp936", API_USE_MODULE(cp936) }, ++ { "cp949", API_USE_MODULE(cp949) }, ++ { "cp950", API_USE_MODULE(cp950) }, ++ { "dec-mcs", API_USE_MODULE(dec_mcs) }, ++ { "ebcdic-at-de", API_USE_MODULE(ebcdic_at_de) }, ++ { "ebcdic-at-de-a", API_USE_MODULE(ebcdic_at_de_a) }, ++ { "ebcdic-ca-fr", API_USE_MODULE(ebcdic_ca_fr) }, ++ { "ebcdic-dk-no", API_USE_MODULE(ebcdic_dk_no) }, ++ { "ebcdic-dk-no-a", API_USE_MODULE(ebcdic_dk_no_a) }, ++ { "ebcdic-es", API_USE_MODULE(ebcdic_es) }, ++ { "ebcdic-es-a", API_USE_MODULE(ebcdic_es_a) }, ++ { "ebcdic-es-s", API_USE_MODULE(ebcdic_es_s) }, ++ { "ebcdic-fi-se", API_USE_MODULE(ebcdic_fi_se) }, ++ { "ebcdic-fi-se-a", API_USE_MODULE(ebcdic_fi_se_a) }, ++ { "ebcdic-fr", API_USE_MODULE(ebcdic_fr) }, ++ { "ebcdic-it", API_USE_MODULE(ebcdic_it) }, ++ { "ebcdic-pt", API_USE_MODULE(ebcdic_pt) }, ++ { "ebcdic-uk", API_USE_MODULE(ebcdic_uk) }, ++ { "ebcdic-us", API_USE_MODULE(ebcdic_us) }, ++ { "euc-jp", API_USE_MODULE(euc_jp) }, ++ { "euc-kr", API_USE_MODULE(euc_kr) }, ++ { "euc-tw", API_USE_MODULE(euc_tw) }, ++ { "gb12345", API_USE_MODULE(gb12345) }, ++ { "gb2312", API_USE_MODULE(gb2312) }, ++ { "gb_2312-80", API_USE_MODULE(gb_2312_80) }, ++ { "hp-roman8", API_USE_MODULE(hp_roman8) }, ++ { "iso646-dk", API_USE_MODULE(iso646_dk) }, ++ { "iso646-kr", API_USE_MODULE(iso646_kr) }, ++ { "iso-10646-ucs-2", API_USE_MODULE(iso_10646_ucs_2) }, ++ { "iso-10646-ucs-4", API_USE_MODULE(iso_10646_ucs_4) }, ++ { "iso-2022-cn", API_USE_MODULE(iso_2022_cn) }, ++ { "iso-2022-jp", API_USE_MODULE(iso_2022_jp) }, ++ { "iso-2022-jp-2", API_USE_MODULE(iso_2022_jp_2) }, ++ { "iso-2022-kr", API_USE_MODULE(iso_2022_kr) }, ++ { "iso-8859-1", API_USE_MODULE(iso_8859_1) }, ++ { "iso-8859-10", API_USE_MODULE(iso_8859_10) }, ++ { "iso-8859-13", API_USE_MODULE(iso_8859_13) }, ++ { "iso-8859-14", API_USE_MODULE(iso_8859_14) }, ++ { "iso-8859-15", API_USE_MODULE(iso_8859_15) }, ++ { "iso-8859-2", API_USE_MODULE(iso_8859_2) }, ++ { "iso-8859-3", API_USE_MODULE(iso_8859_3) }, ++ { "iso-8859-4", API_USE_MODULE(iso_8859_4) }, ++ { "iso-8859-5", API_USE_MODULE(iso_8859_5) }, ++ { "iso-8859-6", API_USE_MODULE(iso_8859_6) }, ++ { "iso-8859-7", API_USE_MODULE(iso_8859_7) }, ++ { "iso-8859-8", API_USE_MODULE(iso_8859_8) }, ++ { "iso-8859-9", API_USE_MODULE(iso_8859_9) }, ++ { "iso-ir-10", API_USE_MODULE(iso_ir_10) }, ++ { "iso-ir-102", API_USE_MODULE(iso_ir_102) }, ++ { "iso-ir-103", API_USE_MODULE(iso_ir_103) }, ++ { "iso-ir-11", API_USE_MODULE(iso_ir_11) }, ++ { "iso-ir-111", API_USE_MODULE(iso_ir_111) }, ++ { "iso-ir-121", API_USE_MODULE(iso_ir_121) }, ++ { "iso-ir-122", API_USE_MODULE(iso_ir_122) }, ++ { "iso-ir-123", API_USE_MODULE(iso_ir_123) }, ++ { "iso-ir-128", API_USE_MODULE(iso_ir_128) }, ++ { "iso-ir-13", API_USE_MODULE(iso_ir_13) }, ++ { "iso-ir-139", API_USE_MODULE(iso_ir_139) }, ++ { "iso-ir-14", API_USE_MODULE(iso_ir_14) }, ++ { "iso-ir-141", API_USE_MODULE(iso_ir_141) }, ++ { "iso-ir-142", API_USE_MODULE(iso_ir_142) }, ++ { "iso-ir-143", API_USE_MODULE(iso_ir_143) }, ++ { "iso-ir-146", API_USE_MODULE(iso_ir_146) }, ++ { "iso-ir-147", API_USE_MODULE(iso_ir_147) }, ++ { "iso-ir-15", API_USE_MODULE(iso_ir_15) }, ++ { "iso-ir-150", API_USE_MODULE(iso_ir_150) }, ++ { "iso-ir-151", API_USE_MODULE(iso_ir_151) }, ++ { "iso-ir-152", API_USE_MODULE(iso_ir_152) }, ++ { "iso-ir-153", API_USE_MODULE(iso_ir_153) }, ++ { "iso-ir-154", API_USE_MODULE(iso_ir_154) }, ++ { "iso-ir-155", API_USE_MODULE(iso_ir_155) }, ++ { "iso-ir-158", API_USE_MODULE(iso_ir_158) }, ++ { "iso-ir-16", API_USE_MODULE(iso_ir_16) }, ++ { "iso-ir-17", API_USE_MODULE(iso_ir_17) }, ++ { "iso-ir-18", API_USE_MODULE(iso_ir_18) }, ++ { "iso-ir-19", API_USE_MODULE(iso_ir_19) }, ++ { "iso-ir-2", API_USE_MODULE(iso_ir_2) }, ++ { "iso-ir-21", API_USE_MODULE(iso_ir_21) }, ++ { "iso-ir-25", API_USE_MODULE(iso_ir_25) }, ++ { "iso-ir-27", API_USE_MODULE(iso_ir_27) }, ++ { "iso-ir-37", API_USE_MODULE(iso_ir_37) }, ++ { "iso-ir-4", API_USE_MODULE(iso_ir_4) }, ++ { "iso-ir-47", API_USE_MODULE(iso_ir_47) }, ++ { "iso-ir-49", API_USE_MODULE(iso_ir_49) }, ++ { "iso-ir-50", API_USE_MODULE(iso_ir_50) }, ++ { "iso-ir-51", API_USE_MODULE(iso_ir_51) }, ++ { "iso-ir-54", API_USE_MODULE(iso_ir_54) }, ++ { "iso-ir-55", API_USE_MODULE(iso_ir_55) }, ++ { "iso-ir-57", API_USE_MODULE(iso_ir_57) }, ++ { "iso-ir-60", API_USE_MODULE(iso_ir_60) }, ++ { "iso-ir-61", API_USE_MODULE(iso_ir_61) }, ++ { "iso-ir-69", API_USE_MODULE(iso_ir_69) }, ++ { "iso-ir-70", API_USE_MODULE(iso_ir_70) }, ++ { "iso-ir-84", API_USE_MODULE(iso_ir_84) }, ++ { "iso-ir-85", API_USE_MODULE(iso_ir_85) }, ++ { "iso-ir-86", API_USE_MODULE(iso_ir_86) }, ++ { "iso-ir-88", API_USE_MODULE(iso_ir_88) }, ++ { "iso-ir-89", API_USE_MODULE(iso_ir_89) }, ++ { "iso-ir-8-1", API_USE_MODULE(iso_ir_8_1) }, ++ { "iso-ir-8-2", API_USE_MODULE(iso_ir_8_2) }, ++ { "iso-ir-90", API_USE_MODULE(iso_ir_90) }, ++ { "iso-ir-91", API_USE_MODULE(iso_ir_91) }, ++ { "iso-ir-92", API_USE_MODULE(iso_ir_92) }, ++ { "iso-ir-93", API_USE_MODULE(iso_ir_93) }, ++ { "iso-ir-94", API_USE_MODULE(iso_ir_94) }, ++ { "iso-ir-95", API_USE_MODULE(iso_ir_95) }, ++ { "iso-ir-96", API_USE_MODULE(iso_ir_96) }, ++ { "iso-ir-98", API_USE_MODULE(iso_ir_98) }, ++ { "iso-ir-99", API_USE_MODULE(iso_ir_99) }, ++ { "iso-ir-9-1", API_USE_MODULE(iso_ir_9_1) }, ++ { "iso-ir-9-2", API_USE_MODULE(iso_ir_9_2) }, ++ { "jis_x0201", API_USE_MODULE(jis_x0201) }, ++ { "jis_x0208-1983", API_USE_MODULE(jis_x0208_1983) }, ++ { "jis_x0212-1990", API_USE_MODULE(jis_x0212_1990) }, ++ { "johab", API_USE_MODULE(johab) }, ++ { "koi8-r", API_USE_MODULE(koi8_r) }, ++ { "koi8-ru", API_USE_MODULE(koi8_ru) }, ++ { "koi8-u", API_USE_MODULE(koi8_u) }, ++ { "ksx1001", API_USE_MODULE(ksx1001) }, ++ { "mac-ce", API_USE_MODULE(mac_ce) }, ++ { "mac-croatian", API_USE_MODULE(mac_croatian) }, ++ { "mac-cyrillic", API_USE_MODULE(mac_cyrillic) }, ++ { "mac-dingbats", API_USE_MODULE(mac_dingbats) }, ++ { "mac-greek", API_USE_MODULE(mac_greek) }, ++ { "mac-iceland", API_USE_MODULE(mac_iceland) }, ++ { "mac-japan", API_USE_MODULE(mac_japan) }, ++ { "mac-roman", API_USE_MODULE(mac_roman) }, ++ { "mac-romania", API_USE_MODULE(mac_romania) }, ++ { "mac-thai", API_USE_MODULE(mac_thai) }, ++ { "mac-turkish", API_USE_MODULE(mac_turkish) }, ++ { "mac-ukraine", API_USE_MODULE(mac_ukraine) }, ++ { "macintosh", API_USE_MODULE(macintosh) }, ++ { "osd_ebcdic_df04_1", API_USE_MODULE(osd_ebcdic_df04_1) }, ++ { "osd_ebcdic_df04_15", API_USE_MODULE(osd_ebcdic_df04_15) }, ++ { "shift_jis", API_USE_MODULE(shift_jis) }, ++ { "ucs2-internal", API_USE_MODULE(ucs2_internal) }, ++ { "ucs4-internal", API_USE_MODULE(ucs4_internal) }, ++ { "unicode-1-1-utf-7", API_USE_MODULE(unicode_1_1_utf_7) }, ++ { "us-ascii", API_USE_MODULE(us_ascii) }, ++ { "utf-16", API_USE_MODULE(utf_16) }, ++ { "utf-8", API_USE_MODULE(utf_8) }, ++ { "windows-1250", API_USE_MODULE(windows_1250) }, ++ { "windows-1251", API_USE_MODULE(windows_1251) }, ++ { "windows-1252", API_USE_MODULE(windows_1252) }, ++ { "windows-1253", API_USE_MODULE(windows_1253) }, ++ { "windows-1254", API_USE_MODULE(windows_1254) }, ++ { "windows-1255", API_USE_MODULE(windows_1255) }, ++ { "windows-1256", API_USE_MODULE(windows_1256) }, ++ { "windows-1257", API_USE_MODULE(windows_1257) }, ++ { "windows-1258", API_USE_MODULE(windows_1258) }, ++ ++ { NULL, 0, NULL} ++}; ++ ++static const size_t static_iconv_modules_count = ++ sizeof(static_iconv_modules)/sizeof(static_iconv_modules[0]) - 1; ++ ++ ++/* Compare two static modules. */ ++static int static_iconv_module_compare (const void *u, const void *v) ++{ ++ const struct static_iconv_module *const a = u; ++ const struct static_iconv_module *const b = v; ++ return strcmp(a->name, b->name); ++} ++ ++static iconv_module_desc_t *static_iconv_module_find(const char *name) ++{ ++ struct static_iconv_module key; ++ struct static_iconv_module *val; ++#if 'A' == '\xC1' /* if EBCDIC host */ ++ /* The table is sorted in ASCII collation order, not in EBCDIC order. ++ * At the first access, we sort it automatically ++ * Criterion for the 1st time initialization is the fact that the ++ * 1st name in the list starts with a digit (in ASCII, numbers ++ * have a lower ordinal value than alphabetic characters; while ++ * in EBCDIC, their ordinal value is higher) ++ */ ++ if (isdigit(static_iconv_modules[0].name[0])) { ++ qsort((void *)static_iconv_modules, static_iconv_modules_count, ++ sizeof(static_iconv_modules[0]), ++ static_iconv_module_compare); ++ } ++#endif ++ key.name = name; ++ val = bsearch(&key, static_iconv_modules, static_iconv_modules_count, ++ sizeof(static_iconv_modules[0]), ++ static_iconv_module_compare); ++ if (val) ++ return val->module; ++ else ++ return NULL; ++} ++ ++ ++static int ++iconv_smopen(const char *name, void **dpp) ++{ ++ ++ char buffer[APR_PATH_MAX]; ++ char *ptr; ++ iconv_module_desc_t *module; ++ ++ if (apr_tolower(name[0]) == 'x' && name[1] == '-') ++ name += 2; ++ ptr = buffer; ++ while (0 != (*ptr++ = apr_tolower(*name++))) ++ module = static_iconv_module_find(buffer); ++ if (!module) { ++ const char *alias = charset_alias_find(buffer); ++ if (alias) { ++ if ((module = static_iconv_module_find(alias))) { ++ *dpp = module; ++ return 0; ++ } ++ } ++ } ++ else { ++ *dpp = module; ++ return 0; ++ } ++ return EINVAL; ++} ++ + static apr_status_t + iconv_getpathname(char *buffer, const char *dir, const char *name, apr_pool_t *ctx) + { +@@ -140,6 +644,7 @@ + return EINVAL; + } + ++ + API_DECLARE_NONSTD(int) + apr_iconv_mod_load(const char *modname, int modtype, const void *args, + struct iconv_module **modpp, apr_pool_t *ctx) +@@ -148,22 +653,28 @@ + struct iconv_module *mod, *depmod; + const struct iconv_module_depend *depend; + char buffer[APR_PATH_MAX]; +- void *handle; ++ void *handle = NULL; + int error; ++ ++ /* Try to load the built-in modules first */ ++ error = iconv_smopen(modname, (void**)&mdesc); ++ if (error) { ++ if (iconv_getpath(buffer, modname, ctx) != 0) ++ return EINVAL; + +- if (iconv_getpath(buffer, modname, ctx) != 0) +- return EINVAL; +- +- error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); ++ error = iconv_dlopen(buffer, "iconv_module", &handle, (void**)&mdesc, ctx); ++ } + if (error) + return error; + if (modtype != ICMOD_ANY && mdesc->imd_type != modtype) { +- apr_dso_unload(handle); ++ if (handle) ++ apr_dso_unload(handle); + return APR_EFTYPE; + } + mod = malloc(sizeof(*mod)); + if (mod == NULL) { +- apr_dso_unload(handle); ++ if (handle) ++ apr_dso_unload(handle); + return ENOMEM; + } + memset(mod, 0, sizeof(*mod));

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1173 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 08:12:32 -0500 (Tue, 11 Dec 2007) New Revision: 1173 Modified: trunk/build/unix/buildbin.rhel-httpd.sh trunk/build/unix/buildsrc.rhel-httpd.sh Log: Arrange it so that it build now on Solaris. Modified: trunk/build/unix/buildbin.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-11 12:57:39 UTC (rev 1172) +++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-11 13:12:32 UTC (rev 1173) @@ -49,10 +49,11 @@ # Function from the httpd.spec file # removed for easy testing. # --with-apr=${_prefix} --with-apr-util=${_prefix} \ -function mpmbuild() +mpmbuild() { mpm=$1; shift -mkdir $mpm; pushd $mpm +mkdir $mpm +(cd $mpm ../configure \ --prefix=${_sysconfdir}/httpd \ --exec-prefix=${_prefix} \ @@ -72,12 +73,11 @@ --with-suexec-logfile=${_localstatedir}/log/httpd/suexec.log \ --with-suexec-bin=${_sbindir}/suexec \ --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ - --enable-pie \ --with-pcre \ $* make -popd +) || exit 1 } # @@ -101,6 +101,11 @@ add_conf="--with-ssl=no" add_conf="" fi +case ${BUILD_SYS} in + linux*) + add_conf="$add_conf --enable-pie" + ;; +esac echo "Building prefork and mpm" native_sources=srclib/`ls srclib | grep httpd-` cd $native_sources @@ -121,7 +126,7 @@ # Install it RPM_BUILD_ROOT=$output_loc -pushd prefork +(cd prefork make DESTDIR=$RPM_BUILD_ROOT install -popd +) || exit 1 install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 12:57:39 UTC (rev 1172) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 13:12:32 UTC (rev 1173) @@ -87,6 +87,22 @@ grep "^%patch" ${rhel_loc}/httpd.spec | sed 's:%:@:' | sed 's: :@ :' | awk ' { print $1 " " $2 } ' > ${WHERE}/patch.cmd grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed 's/:/@/' | awk ' { print "s:" $1 ": patch -i @DIR@" $2 ":" } ' > ${WHERE}/patch.files sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:" > ${WHERE}/patch.sh + +# +# Remove linux specific patches. +case ${BUILD_SYS} in + linux*) + remove_list="" + ;; + *) + remove_list="httpd-2.0.54-selinux.patch" + ;; +esac +if [ -z ${remove_list} ]; then + echo "Linux applying all the rhel patches" +else + cat ${WHERE}/patch.sh | grep -v ${remove_list} > ${WHERE}/patch.sh +fi echo "Applying the rhel patches to ${dirsources}" chmod a+x ${WHERE}/patch.sh (cd ${dirsources}

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1172 - trunk/srclib/apr-iconv.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-11 07:57:39 -0500 (Tue, 11 Dec 2007) New Revision: 1172 Modified: trunk/srclib/apr-iconv/AUTHORS trunk/srclib/apr-iconv/CHANGES trunk/srclib/apr-iconv/COPYING trunk/srclib/apr-iconv/LICENSE trunk/srclib/apr-iconv/NMAKEmakefile trunk/srclib/apr-iconv/NOTICE trunk/srclib/apr-iconv/STATUS trunk/srclib/apr-iconv/libapriconv.rc Log: Update native EOL style Modified: trunk/srclib/apr-iconv/AUTHORS =================================================================== --- trunk/srclib/apr-iconv/AUTHORS 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/AUTHORS 2007-12-11 12:57:39 UTC (rev 1172) @@ -1 +1 @@ -Konstantin Chuguev <Konstantin.Chuguev(a)dante.org.uk> +Konstantin Chuguev <Konstantin.Chuguev(a)dante.org.uk> Property changes on: trunk/srclib/apr-iconv/AUTHORS ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/CHANGES =================================================================== --- trunk/srclib/apr-iconv/CHANGES 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/CHANGES 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,85 +1,85 @@ - -*- coding: utf-8 -*- -Changes with APR-ICONV 1.2.2 - - - -Changes with APR-ICONV 1.2.1 - - *) Build schema fixes for win32 including VC8 precompiled header files, - NT and 9x specific builds, and x86_64 P64 model. [William Rowe] - - *) Build schema fixes for unix including default --prefix, vpath builds, - and decorated lib name. [Davi Arnaut, William Rowe, Henry Jen] - -Changes with APR-ICONV 1.2.0 - - *) Install 'iconv' utility as bin/apriconv to avoid colliding with - system provided iconv, install public headers to include/apr-1/ - per convention. [William Rowe] - - *) Fixes for Mingw builds and normalize to the APR conventions (e.g. - apriconv-1.so library name). [Kouhei Sutou <kou cozmixng.org>] - - *) Fix compiler emits for char <-> 2byte unicode pointer assignments. - [William Rowe] - - *) Correct from_ucs zero width joiner/byte order mark to be injected - only at the *start* of stream (when state is still 0). - PR 24387 [Kohn Emil Dan <emild cs.technion.ac.il>] - - *) Fix build on GCC 4.0 - [William Barker <william.barker wilshire.com>] - -Changes with APR-ICONV 1.1.0 - - *) Correctly resolve to APR-1.0, never APR-0.9 in ./buildconf - [William Rowe] - - *) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x - flavors (the pool arguments to several internal functions changed - in 1.0, so the loadable charset modules are not binary compatible.) - To maintain APR-iconv 1.0 compatibility, first APR_ICONV1 is used, - if it is set then the older 0.9 flavor APR_ICONV_PATH won't be - searched. apr-iconv 0.9 and 1.0 will only coexist if both the - APR_ICONV1_PATH and APR_ICONV_PATH variables are both set to their - respective charset directories. [William Rowe] - -Changes with APR-ICONV 1.0.2 - - *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz] - -Changes with APR-ICONV 1.0.1 - -Changes with APR-ICONV 1.0.0 - - *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it - consistent with the behaviour of apr and apr-util. [Graham Leggett] - -Changes with APR-ICONV 0.9.5 - -Changes with APR-ICONV 0.9.4 - - *) Add -v option to iconv program. [Justin Erenkrantz] - - *) Add api_version.h. [Justin Erenkrantz] - - *) A fourth pass at a build system. [Justin Erenkrantz] - - *) A third pass at a build system. [Justin Erenkrantz] - -Changes with APR-ICONV 0.9.3 - -Changes with APR-ICONV 0.9.2 - - *) A second pass at a working build system - now builds on linux, - some namespace protection added. - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) A first blush at a working build system. - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) First set of changes for APR compatibility (eliminated __inline). - [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] - - *) Source moved from the apr library into it's own repository - due to size concerns. Still requires portability overhaul. + -*- coding: utf-8 -*- +Changes with APR-ICONV 1.2.2 + + + +Changes with APR-ICONV 1.2.1 + + *) Build schema fixes for win32 including VC8 precompiled header files, + NT and 9x specific builds, and x86_64 P64 model. [William Rowe] + + *) Build schema fixes for unix including default --prefix, vpath builds, + and decorated lib name. [Davi Arnaut, William Rowe, Henry Jen] + +Changes with APR-ICONV 1.2.0 + + *) Install 'iconv' utility as bin/apriconv to avoid colliding with + system provided iconv, install public headers to include/apr-1/ + per convention. [William Rowe] + + *) Fixes for Mingw builds and normalize to the APR conventions (e.g. + apriconv-1.so library name). [Kouhei Sutou <kou cozmixng.org>] + + *) Fix compiler emits for char <-> 2byte unicode pointer assignments. + [William Rowe] + + *) Correct from_ucs zero width joiner/byte order mark to be injected + only at the *start* of stream (when state is still 0). + PR 24387 [Kohn Emil Dan <emild cs.technion.ac.il>] + + *) Fix build on GCC 4.0 + [William Barker <william.barker wilshire.com>] + +Changes with APR-ICONV 1.1.0 + + *) Correctly resolve to APR-1.0, never APR-0.9 in ./buildconf + [William Rowe] + + *) APR_ICONV1_PATH distinguishes between our apr-iconv 0.9 and 1.x + flavors (the pool arguments to several internal functions changed + in 1.0, so the loadable charset modules are not binary compatible.) + To maintain APR-iconv 1.0 compatibility, first APR_ICONV1 is used, + if it is set then the older 0.9 flavor APR_ICONV_PATH won't be + searched. apr-iconv 0.9 and 1.0 will only coexist if both the + APR_ICONV1_PATH and APR_ICONV_PATH variables are both set to their + respective charset directories. [William Rowe] + +Changes with APR-ICONV 1.0.2 + + *) Fix libapriconv.rc for Win32 builds [William Rowe, Justin Erenkrantz] + +Changes with APR-ICONV 1.0.1 + +Changes with APR-ICONV 1.0.0 + + *) Add the possiblity of a DESTDIR prefix to Makefile.in to make it + consistent with the behaviour of apr and apr-util. [Graham Leggett] + +Changes with APR-ICONV 0.9.5 + +Changes with APR-ICONV 0.9.4 + + *) Add -v option to iconv program. [Justin Erenkrantz] + + *) Add api_version.h. [Justin Erenkrantz] + + *) A fourth pass at a build system. [Justin Erenkrantz] + + *) A third pass at a build system. [Justin Erenkrantz] + +Changes with APR-ICONV 0.9.3 + +Changes with APR-ICONV 0.9.2 + + *) A second pass at a working build system - now builds on linux, + some namespace protection added. + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) A first blush at a working build system. + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) First set of changes for APR compatibility (eliminated __inline). + [jean-frederic clere <jfrederic.clere(a)fujitsu-siemens.com>] + + *) Source moved from the apr library into it's own repository + due to size concerns. Still requires portability overhaul. Property changes on: trunk/srclib/apr-iconv/CHANGES ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/COPYING =================================================================== --- trunk/srclib/apr-iconv/COPYING 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/COPYING 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,31 +1,31 @@ -/*- - * Copyright (c) 2000 - * Konstantin Chuguev. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Konstantin Chuguev - * and its contributors. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * iconv (Charset Conversion Library) v1.0 - */ +/*- + * Copyright (c) 2000 + * Konstantin Chuguev. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Konstantin Chuguev + * and its contributors. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * iconv (Charset Conversion Library) v1.0 + */ Property changes on: trunk/srclib/apr-iconv/COPYING ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/LICENSE =================================================================== --- trunk/srclib/apr-iconv/LICENSE 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/LICENSE 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,204 +1,204 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Property changes on: trunk/srclib/apr-iconv/LICENSE ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/srclib/apr-iconv/NMAKEmakefile 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/NMAKEmakefile 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,334 +1,334 @@ -# Copyright 2001-2007 The Apache Software Foundation or its licensors, as -# applicable. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ==================================================================== -# -# NMAKEmakefile Master APR-ICONV makefile. -# Usage: -# DLL=1 Build DLL version -# DEBUG=1 Build DEBUG version of APR -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - - -!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" -TARGET=DLL -CFLAGS = -DAPR_DECLARE_EXPORT -DAPI_DECLARE_EXPORT -DAPI_MODULE_STATIC $(CFLAGS) -PROJECT = libapriconv-1 -APR_LIB = libapr-1.lib -!ELSE -CFLAGS = -DAPR_DECLARE_STATIC -DAPI_DECLARE_STATIC -DAPI_MODULE_STATIC $(CFLAGS) -PROJECT = apriconv-1 -APR_LIB = apr-1.lib -TARGET=LIB -!ENDIF - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <..\..\NMAKEcommon.inc> - -!IFNDEF WITH_APR -!ERROR WITH_APR Not defined -!ENDIF - -LDIRS = /libpath:"$(WITH_APR)\lib" - -LFLAGS = $(LFLAGS) $(APR_LIB) -!IF "$(TARGET)" == "DLL" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib -!ENDIF - -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\lib -I$(WITH_APR)\include\apr-1 -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src -OBJECTS = \ - $(WORKDIR)\adobe-stdenc.obj \ - $(WORKDIR)\adobe-symbol.obj \ - $(WORKDIR)\adobe-zdingbats.obj \ - $(WORKDIR)\big5.obj \ - $(WORKDIR)\cns11643-plane1.obj \ - $(WORKDIR)\cns11643-plane14.obj \ - $(WORKDIR)\cns11643-plane2.obj \ - $(WORKDIR)\cp037.obj \ - $(WORKDIR)\cp038.obj \ - $(WORKDIR)\cp10000.obj \ - $(WORKDIR)\cp10006.obj \ - $(WORKDIR)\cp10007.obj \ - $(WORKDIR)\cp10029.obj \ - $(WORKDIR)\cp1006.obj \ - $(WORKDIR)\cp10079.obj \ - $(WORKDIR)\cp10081.obj \ - $(WORKDIR)\cp1026.obj \ - $(WORKDIR)\cp273.obj \ - $(WORKDIR)\cp274.obj \ - $(WORKDIR)\cp275.obj \ - $(WORKDIR)\cp277.obj \ - $(WORKDIR)\cp278.obj \ - $(WORKDIR)\cp280.obj \ - $(WORKDIR)\cp281.obj \ - $(WORKDIR)\cp284.obj \ - $(WORKDIR)\cp285.obj \ - $(WORKDIR)\cp290.obj \ - $(WORKDIR)\cp297.obj \ - $(WORKDIR)\cp420.obj \ - $(WORKDIR)\cp423.obj \ - $(WORKDIR)\cp424.obj \ - $(WORKDIR)\cp437.obj \ - $(WORKDIR)\cp500.obj \ - $(WORKDIR)\cp737.obj \ - $(WORKDIR)\cp775.obj \ - $(WORKDIR)\cp850.obj \ - $(WORKDIR)\cp851.obj \ - $(WORKDIR)\cp852.obj \ - $(WORKDIR)\cp855.obj \ - $(WORKDIR)\cp856.obj \ - $(WORKDIR)\cp857.obj \ - $(WORKDIR)\cp860.obj \ - $(WORKDIR)\cp861.obj \ - $(WORKDIR)\cp862.obj \ - $(WORKDIR)\cp863.obj \ - $(WORKDIR)\cp864.obj \ - $(WORKDIR)\cp865.obj \ - $(WORKDIR)\cp866.obj \ - $(WORKDIR)\cp868.obj \ - $(WORKDIR)\cp869.obj \ - $(WORKDIR)\cp870.obj \ - $(WORKDIR)\cp871.obj \ - $(WORKDIR)\cp874.obj \ - $(WORKDIR)\cp875.obj \ - $(WORKDIR)\cp880.obj \ - $(WORKDIR)\cp891.obj \ - $(WORKDIR)\cp903.obj \ - $(WORKDIR)\cp904.obj \ - $(WORKDIR)\cp905.obj \ - $(WORKDIR)\cp918.obj \ - $(WORKDIR)\cp932.obj \ - $(WORKDIR)\cp936.obj \ - $(WORKDIR)\cp949.obj \ - $(WORKDIR)\cp950.obj \ - $(WORKDIR)\dec-mcs.obj \ - $(WORKDIR)\ebcdic-at-de-a.obj \ - $(WORKDIR)\ebcdic-at-de.obj \ - $(WORKDIR)\ebcdic-ca-fr.obj \ - $(WORKDIR)\ebcdic-dk-no-a.obj \ - $(WORKDIR)\ebcdic-dk-no.obj \ - $(WORKDIR)\ebcdic-es-a.obj \ - $(WORKDIR)\ebcdic-es-s.obj \ - $(WORKDIR)\ebcdic-es.obj \ - $(WORKDIR)\ebcdic-fi-se-a.obj \ - $(WORKDIR)\ebcdic-fi-se.obj \ - $(WORKDIR)\ebcdic-fr.obj \ - $(WORKDIR)\ebcdic-it.obj \ - $(WORKDIR)\ebcdic-pt.obj \ - $(WORKDIR)\ebcdic-uk.obj \ - $(WORKDIR)\ebcdic-us.obj \ - $(WORKDIR)\gb12345.obj \ - $(WORKDIR)\gb_2312-80.obj \ - $(WORKDIR)\hp-roman8.obj \ - $(WORKDIR)\iso-8859-1.obj \ - $(WORKDIR)\iso-8859-10.obj \ - $(WORKDIR)\iso-8859-13.obj \ - $(WORKDIR)\iso-8859-14.obj \ - $(WORKDIR)\iso-8859-15.obj \ - $(WORKDIR)\iso-8859-2.obj \ - $(WORKDIR)\iso-8859-3.obj \ - $(WORKDIR)\iso-8859-4.obj \ - $(WORKDIR)\iso-8859-5.obj \ - $(WORKDIR)\iso-8859-6.obj \ - $(WORKDIR)\iso-8859-7.obj \ - $(WORKDIR)\iso-8859-8.obj \ - $(WORKDIR)\iso-8859-9.obj \ - $(WORKDIR)\iso-ir-10.obj \ - $(WORKDIR)\iso-ir-102.obj \ - $(WORKDIR)\iso-ir-103.obj \ - $(WORKDIR)\iso-ir-11.obj \ - $(WORKDIR)\iso-ir-111.obj \ - $(WORKDIR)\iso-ir-121.obj \ - $(WORKDIR)\iso-ir-122.obj \ - $(WORKDIR)\iso-ir-123.obj \ - $(WORKDIR)\iso-ir-128.obj \ - $(WORKDIR)\iso-ir-13.obj \ - $(WORKDIR)\iso-ir-139.obj \ - $(WORKDIR)\iso-ir-14.obj \ - $(WORKDIR)\iso-ir-141.obj \ - $(WORKDIR)\iso-ir-142.obj \ - $(WORKDIR)\iso-ir-143.obj \ - $(WORKDIR)\iso-ir-146.obj \ - $(WORKDIR)\iso-ir-147.obj \ - $(WORKDIR)\iso-ir-15.obj \ - $(WORKDIR)\iso-ir-150.obj \ - $(WORKDIR)\iso-ir-151.obj \ - $(WORKDIR)\iso-ir-152.obj \ - $(WORKDIR)\iso-ir-153.obj \ - $(WORKDIR)\iso-ir-154.obj \ - $(WORKDIR)\iso-ir-155.obj \ - $(WORKDIR)\iso-ir-158.obj \ - $(WORKDIR)\iso-ir-16.obj \ - $(WORKDIR)\iso-ir-17.obj \ - $(WORKDIR)\iso-ir-18.obj \ - $(WORKDIR)\iso-ir-19.obj \ - $(WORKDIR)\iso-ir-2.obj \ - $(WORKDIR)\iso-ir-21.obj \ - $(WORKDIR)\iso-ir-25.obj \ - $(WORKDIR)\iso-ir-27.obj \ - $(WORKDIR)\iso-ir-37.obj \ - $(WORKDIR)\iso-ir-4.obj \ - $(WORKDIR)\iso-ir-47.obj \ - $(WORKDIR)\iso-ir-49.obj \ - $(WORKDIR)\iso-ir-50.obj \ - $(WORKDIR)\iso-ir-51.obj \ - $(WORKDIR)\iso-ir-54.obj \ - $(WORKDIR)\iso-ir-55.obj \ - $(WORKDIR)\iso-ir-57.obj \ - $(WORKDIR)\iso-ir-60.obj \ - $(WORKDIR)\iso-ir-61.obj \ - $(WORKDIR)\iso-ir-69.obj \ - $(WORKDIR)\iso-ir-70.obj \ - $(WORKDIR)\iso-ir-8-1.obj \ - $(WORKDIR)\iso-ir-8-2.obj \ - $(WORKDIR)\iso-ir-84.obj \ - $(WORKDIR)\iso-ir-85.obj \ - $(WORKDIR)\iso-ir-86.obj \ - $(WORKDIR)\iso-ir-88.obj \ - $(WORKDIR)\iso-ir-89.obj \ - $(WORKDIR)\iso-ir-9-1.obj \ - $(WORKDIR)\iso-ir-9-2.obj \ - $(WORKDIR)\iso-ir-90.obj \ - $(WORKDIR)\iso-ir-91.obj \ - $(WORKDIR)\iso-ir-92.obj \ - $(WORKDIR)\iso-ir-93.obj \ - $(WORKDIR)\iso-ir-94.obj \ - $(WORKDIR)\iso-ir-95.obj \ - $(WORKDIR)\iso-ir-96.obj \ - $(WORKDIR)\iso-ir-98.obj \ - $(WORKDIR)\iso-ir-99.obj \ - $(WORKDIR)\iso646-dk.obj \ - $(WORKDIR)\iso646-kr.obj \ - $(WORKDIR)\jis_x0201.obj \ - $(WORKDIR)\jis_x0208-1983.obj \ - $(WORKDIR)\jis_x0212-1990.obj \ - $(WORKDIR)\johab.obj \ - $(WORKDIR)\koi8-r.obj \ - $(WORKDIR)\koi8-ru.obj \ - $(WORKDIR)\koi8-u.obj \ - $(WORKDIR)\ksx1001.obj \ - $(WORKDIR)\mac-ce.obj \ - $(WORKDIR)\mac-croatian.obj \ - $(WORKDIR)\mac-cyrillic.obj \ - $(WORKDIR)\mac-dingbats.obj \ - $(WORKDIR)\mac-greek.obj \ - $(WORKDIR)\mac-iceland.obj \ - $(WORKDIR)\mac-japan.obj \ - $(WORKDIR)\mac-roman.obj \ - $(WORKDIR)\mac-romania.obj \ - $(WORKDIR)\mac-thai.obj \ - $(WORKDIR)\mac-turkish.obj \ - $(WORKDIR)\mac-ukraine.obj \ - $(WORKDIR)\macintosh.obj \ - $(WORKDIR)\osd_ebcdic_df04_1.obj \ - $(WORKDIR)\osd_ebcdic_df04_15.obj \ - $(WORKDIR)\shift_jis.obj \ - $(WORKDIR)\us-ascii.obj \ - $(WORKDIR)\windows-1250.obj \ - $(WORKDIR)\windows-1251.obj \ - $(WORKDIR)\windows-1252.obj \ - $(WORKDIR)\windows-1253.obj \ - $(WORKDIR)\windows-1254.obj \ - $(WORKDIR)\windows-1255.obj \ - $(WORKDIR)\windows-1256.obj \ - $(WORKDIR)\windows-1257.obj \ - $(WORKDIR)\windows-1258.obj \ - $(WORKDIR)\_tbl_simple.obj \ - $(WORKDIR)\euc-jp.obj \ - $(WORKDIR)\euc-kr.obj \ - $(WORKDIR)\euc-tw.obj \ - $(WORKDIR)\gb2312.obj \ - $(WORKDIR)\iso-10646-ucs-2.obj \ - $(WORKDIR)\iso-10646-ucs-4.obj \ - $(WORKDIR)\iso-2022-cn.obj \ - $(WORKDIR)\iso-2022-jp-2.obj \ - $(WORKDIR)\iso-2022-jp.obj \ - $(WORKDIR)\iso-2022-kr.obj \ - $(WORKDIR)\ucs2-internal.obj \ - $(WORKDIR)\ucs4-internal.obj \ - $(WORKDIR)\unicode-1-1-utf-7.obj \ - $(WORKDIR)\utf-16.obj \ - $(WORKDIR)\utf-8.obj \ - $(WORKDIR)\api_version.obj \ - $(WORKDIR)\iconv.obj \ - $(WORKDIR)\iconv_ccs.obj \ - $(WORKDIR)\iconv_ces.obj \ - $(WORKDIR)\iconv_ces_euc.obj \ - $(WORKDIR)\iconv_ces_iso2022.obj \ - $(WORKDIR)\iconv_int.obj \ - $(WORKDIR)\iconv_module.obj \ - $(WORKDIR)\iconv_uc.obj - - -BUILDLIB = $(PREFIX)\lib -BUILDINC = $(PREFIX)\include\apr-1 - -!IF "$(TARGET)" == "DLL" -BUILDBIN = $(WORKDIR)\$(PROJECT).dll -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest -!ELSE -BUILDBIN = $(WORKDIR)\$(PROJECT).lib -!ENDIF - -all : $(WORKDIR) $(BUILDLIB) - -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(WORKDIR) : - @$(MAKEWORKDIR) - -{$(SRCDIR)\ccs}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)\ces}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)\lib}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - - -$(OBJECTS): $(SRCDIR)\include\*.h - -!IF "$(TARGET)" == "DLL" -$(BUILDRES): libapriconv.rc - $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc -$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 -!ELSE -$(BUILDBIN): $(WORKDIR) $(OBJECTS) - $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) -!ENDIF - -clean: - @$(CLEANTARGET) - -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q - @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL +# Copyright 2001-2007 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR-ICONV makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT -DAPI_DECLARE_EXPORT -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = libapriconv-1 +APR_LIB = libapr-1.lib +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC -DAPI_DECLARE_STATIC -DAPI_MODULE_STATIC $(CFLAGS) +PROJECT = apriconv-1 +APR_LIB = apr-1.lib +TARGET=LIB +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IFNDEF WITH_APR +!ERROR WITH_APR Not defined +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\lib" + +LFLAGS = $(LFLAGS) $(APR_LIB) +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\lib -I$(WITH_APR)\include\apr-1 +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adobe-stdenc.obj \ + $(WORKDIR)\adobe-symbol.obj \ + $(WORKDIR)\adobe-zdingbats.obj \ + $(WORKDIR)\big5.obj \ + $(WORKDIR)\cns11643-plane1.obj \ + $(WORKDIR)\cns11643-plane14.obj \ + $(WORKDIR)\cns11643-plane2.obj \ + $(WORKDIR)\cp037.obj \ + $(WORKDIR)\cp038.obj \ + $(WORKDIR)\cp10000.obj \ + $(WORKDIR)\cp10006.obj \ + $(WORKDIR)\cp10007.obj \ + $(WORKDIR)\cp10029.obj \ + $(WORKDIR)\cp1006.obj \ + $(WORKDIR)\cp10079.obj \ + $(WORKDIR)\cp10081.obj \ + $(WORKDIR)\cp1026.obj \ + $(WORKDIR)\cp273.obj \ + $(WORKDIR)\cp274.obj \ + $(WORKDIR)\cp275.obj \ + $(WORKDIR)\cp277.obj \ + $(WORKDIR)\cp278.obj \ + $(WORKDIR)\cp280.obj \ + $(WORKDIR)\cp281.obj \ + $(WORKDIR)\cp284.obj \ + $(WORKDIR)\cp285.obj \ + $(WORKDIR)\cp290.obj \ + $(WORKDIR)\cp297.obj \ + $(WORKDIR)\cp420.obj \ + $(WORKDIR)\cp423.obj \ + $(WORKDIR)\cp424.obj \ + $(WORKDIR)\cp437.obj \ + $(WORKDIR)\cp500.obj \ + $(WORKDIR)\cp737.obj \ + $(WORKDIR)\cp775.obj \ + $(WORKDIR)\cp850.obj \ + $(WORKDIR)\cp851.obj \ + $(WORKDIR)\cp852.obj \ + $(WORKDIR)\cp855.obj \ + $(WORKDIR)\cp856.obj \ + $(WORKDIR)\cp857.obj \ + $(WORKDIR)\cp860.obj \ + $(WORKDIR)\cp861.obj \ + $(WORKDIR)\cp862.obj \ + $(WORKDIR)\cp863.obj \ + $(WORKDIR)\cp864.obj \ + $(WORKDIR)\cp865.obj \ + $(WORKDIR)\cp866.obj \ + $(WORKDIR)\cp868.obj \ + $(WORKDIR)\cp869.obj \ + $(WORKDIR)\cp870.obj \ + $(WORKDIR)\cp871.obj \ + $(WORKDIR)\cp874.obj \ + $(WORKDIR)\cp875.obj \ + $(WORKDIR)\cp880.obj \ + $(WORKDIR)\cp891.obj \ + $(WORKDIR)\cp903.obj \ + $(WORKDIR)\cp904.obj \ + $(WORKDIR)\cp905.obj \ + $(WORKDIR)\cp918.obj \ + $(WORKDIR)\cp932.obj \ + $(WORKDIR)\cp936.obj \ + $(WORKDIR)\cp949.obj \ + $(WORKDIR)\cp950.obj \ + $(WORKDIR)\dec-mcs.obj \ + $(WORKDIR)\ebcdic-at-de-a.obj \ + $(WORKDIR)\ebcdic-at-de.obj \ + $(WORKDIR)\ebcdic-ca-fr.obj \ + $(WORKDIR)\ebcdic-dk-no-a.obj \ + $(WORKDIR)\ebcdic-dk-no.obj \ + $(WORKDIR)\ebcdic-es-a.obj \ + $(WORKDIR)\ebcdic-es-s.obj \ + $(WORKDIR)\ebcdic-es.obj \ + $(WORKDIR)\ebcdic-fi-se-a.obj \ + $(WORKDIR)\ebcdic-fi-se.obj \ + $(WORKDIR)\ebcdic-fr.obj \ + $(WORKDIR)\ebcdic-it.obj \ + $(WORKDIR)\ebcdic-pt.obj \ + $(WORKDIR)\ebcdic-uk.obj \ + $(WORKDIR)\ebcdic-us.obj \ + $(WORKDIR)\gb12345.obj \ + $(WORKDIR)\gb_2312-80.obj \ + $(WORKDIR)\hp-roman8.obj \ + $(WORKDIR)\iso-8859-1.obj \ + $(WORKDIR)\iso-8859-10.obj \ + $(WORKDIR)\iso-8859-13.obj \ + $(WORKDIR)\iso-8859-14.obj \ + $(WORKDIR)\iso-8859-15.obj \ + $(WORKDIR)\iso-8859-2.obj \ + $(WORKDIR)\iso-8859-3.obj \ + $(WORKDIR)\iso-8859-4.obj \ + $(WORKDIR)\iso-8859-5.obj \ + $(WORKDIR)\iso-8859-6.obj \ + $(WORKDIR)\iso-8859-7.obj \ + $(WORKDIR)\iso-8859-8.obj \ + $(WORKDIR)\iso-8859-9.obj \ + $(WORKDIR)\iso-ir-10.obj \ + $(WORKDIR)\iso-ir-102.obj \ + $(WORKDIR)\iso-ir-103.obj \ + $(WORKDIR)\iso-ir-11.obj \ + $(WORKDIR)\iso-ir-111.obj \ + $(WORKDIR)\iso-ir-121.obj \ + $(WORKDIR)\iso-ir-122.obj \ + $(WORKDIR)\iso-ir-123.obj \ + $(WORKDIR)\iso-ir-128.obj \ + $(WORKDIR)\iso-ir-13.obj \ + $(WORKDIR)\iso-ir-139.obj \ + $(WORKDIR)\iso-ir-14.obj \ + $(WORKDIR)\iso-ir-141.obj \ + $(WORKDIR)\iso-ir-142.obj \ + $(WORKDIR)\iso-ir-143.obj \ + $(WORKDIR)\iso-ir-146.obj \ + $(WORKDIR)\iso-ir-147.obj \ + $(WORKDIR)\iso-ir-15.obj \ + $(WORKDIR)\iso-ir-150.obj \ + $(WORKDIR)\iso-ir-151.obj \ + $(WORKDIR)\iso-ir-152.obj \ + $(WORKDIR)\iso-ir-153.obj \ + $(WORKDIR)\iso-ir-154.obj \ + $(WORKDIR)\iso-ir-155.obj \ + $(WORKDIR)\iso-ir-158.obj \ + $(WORKDIR)\iso-ir-16.obj \ + $(WORKDIR)\iso-ir-17.obj \ + $(WORKDIR)\iso-ir-18.obj \ + $(WORKDIR)\iso-ir-19.obj \ + $(WORKDIR)\iso-ir-2.obj \ + $(WORKDIR)\iso-ir-21.obj \ + $(WORKDIR)\iso-ir-25.obj \ + $(WORKDIR)\iso-ir-27.obj \ + $(WORKDIR)\iso-ir-37.obj \ + $(WORKDIR)\iso-ir-4.obj \ + $(WORKDIR)\iso-ir-47.obj \ + $(WORKDIR)\iso-ir-49.obj \ + $(WORKDIR)\iso-ir-50.obj \ + $(WORKDIR)\iso-ir-51.obj \ + $(WORKDIR)\iso-ir-54.obj \ + $(WORKDIR)\iso-ir-55.obj \ + $(WORKDIR)\iso-ir-57.obj \ + $(WORKDIR)\iso-ir-60.obj \ + $(WORKDIR)\iso-ir-61.obj \ + $(WORKDIR)\iso-ir-69.obj \ + $(WORKDIR)\iso-ir-70.obj \ + $(WORKDIR)\iso-ir-8-1.obj \ + $(WORKDIR)\iso-ir-8-2.obj \ + $(WORKDIR)\iso-ir-84.obj \ + $(WORKDIR)\iso-ir-85.obj \ + $(WORKDIR)\iso-ir-86.obj \ + $(WORKDIR)\iso-ir-88.obj \ + $(WORKDIR)\iso-ir-89.obj \ + $(WORKDIR)\iso-ir-9-1.obj \ + $(WORKDIR)\iso-ir-9-2.obj \ + $(WORKDIR)\iso-ir-90.obj \ + $(WORKDIR)\iso-ir-91.obj \ + $(WORKDIR)\iso-ir-92.obj \ + $(WORKDIR)\iso-ir-93.obj \ + $(WORKDIR)\iso-ir-94.obj \ + $(WORKDIR)\iso-ir-95.obj \ + $(WORKDIR)\iso-ir-96.obj \ + $(WORKDIR)\iso-ir-98.obj \ + $(WORKDIR)\iso-ir-99.obj \ + $(WORKDIR)\iso646-dk.obj \ + $(WORKDIR)\iso646-kr.obj \ + $(WORKDIR)\jis_x0201.obj \ + $(WORKDIR)\jis_x0208-1983.obj \ + $(WORKDIR)\jis_x0212-1990.obj \ + $(WORKDIR)\johab.obj \ + $(WORKDIR)\koi8-r.obj \ + $(WORKDIR)\koi8-ru.obj \ + $(WORKDIR)\koi8-u.obj \ + $(WORKDIR)\ksx1001.obj \ + $(WORKDIR)\mac-ce.obj \ + $(WORKDIR)\mac-croatian.obj \ + $(WORKDIR)\mac-cyrillic.obj \ + $(WORKDIR)\mac-dingbats.obj \ + $(WORKDIR)\mac-greek.obj \ + $(WORKDIR)\mac-iceland.obj \ + $(WORKDIR)\mac-japan.obj \ + $(WORKDIR)\mac-roman.obj \ + $(WORKDIR)\mac-romania.obj \ + $(WORKDIR)\mac-thai.obj \ + $(WORKDIR)\mac-turkish.obj \ + $(WORKDIR)\mac-ukraine.obj \ + $(WORKDIR)\macintosh.obj \ + $(WORKDIR)\osd_ebcdic_df04_1.obj \ + $(WORKDIR)\osd_ebcdic_df04_15.obj \ + $(WORKDIR)\shift_jis.obj \ + $(WORKDIR)\us-ascii.obj \ + $(WORKDIR)\windows-1250.obj \ + $(WORKDIR)\windows-1251.obj \ + $(WORKDIR)\windows-1252.obj \ + $(WORKDIR)\windows-1253.obj \ + $(WORKDIR)\windows-1254.obj \ + $(WORKDIR)\windows-1255.obj \ + $(WORKDIR)\windows-1256.obj \ + $(WORKDIR)\windows-1257.obj \ + $(WORKDIR)\windows-1258.obj \ + $(WORKDIR)\_tbl_simple.obj \ + $(WORKDIR)\euc-jp.obj \ + $(WORKDIR)\euc-kr.obj \ + $(WORKDIR)\euc-tw.obj \ + $(WORKDIR)\gb2312.obj \ + $(WORKDIR)\iso-10646-ucs-2.obj \ + $(WORKDIR)\iso-10646-ucs-4.obj \ + $(WORKDIR)\iso-2022-cn.obj \ + $(WORKDIR)\iso-2022-jp-2.obj \ + $(WORKDIR)\iso-2022-jp.obj \ + $(WORKDIR)\iso-2022-kr.obj \ + $(WORKDIR)\ucs2-internal.obj \ + $(WORKDIR)\ucs4-internal.obj \ + $(WORKDIR)\unicode-1-1-utf-7.obj \ + $(WORKDIR)\utf-16.obj \ + $(WORKDIR)\utf-8.obj \ + $(WORKDIR)\api_version.obj \ + $(WORKDIR)\iconv.obj \ + $(WORKDIR)\iconv_ccs.obj \ + $(WORKDIR)\iconv_ces.obj \ + $(WORKDIR)\iconv_ces_euc.obj \ + $(WORKDIR)\iconv_ces_iso2022.obj \ + $(WORKDIR)\iconv_int.obj \ + $(WORKDIR)\iconv_module.obj \ + $(WORKDIR)\iconv_uc.obj + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include\apr-1 + +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(WORKDIR) $(BUILDLIB) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)\ccs}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\ces}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\lib}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + + +$(OBJECTS): $(SRCDIR)\include\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapriconv.rc + $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "API_VERSION_ONLY" /fo $(BUILDRES) $(SRCDIR)\libapriconv.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/srclib/apr-iconv/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/NOTICE =================================================================== --- trunk/srclib/apr-iconv/NOTICE 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/NOTICE 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,2 +1,2 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). Property changes on: trunk/srclib/apr-iconv/NOTICE ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/STATUS =================================================================== --- trunk/srclib/apr-iconv/STATUS 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/STATUS 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,47 +1,47 @@ -APACHE PORTABLE RUNTIME APR-ICONV LIBRARY STATUS: -*- coding: utf-8 -*- -Last modified at [$Date: 2007-11-26 22:52:06 +0100 (pon, 26 stu 2007) $] - -Releases: - 1.2.2 : in development - 1.2.1 : released November 26, 2007 - 1.2.0 : released June 7, 2007 - 1.1.1 : released November 23, 2005 - 1.1.0 : not released - 1.0.1 : released November 19, 2004 - 1.0.0 : released September 1, 2004 - 0.9.7 : released October 11, 2005 - 0.9.6 : not released - 0.9.5 : released November 16, 2004 - 0.9.4 : released September 26, 2003 - 0.9.3 : tagged March 30, 2002 - 0.9.2 : released March 22, 2002 (alpha) - -RELEASE SHOWSTOPPERS: - - -RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: - - * Drop modules.c code and replace much functionality with the - apr dso methods, etc. - -Other bugs that need fixing: - - * APR-util ./testall demonstrates that on finalization (when the - users calls with NULL inbuf and their target outbuf) that the - utf-7 converter doesn't exit the shift-state. Not certain that - this is in fact a bug in the code, an unimplemented feature or - a mistaken assumption in the apr-util/test/testxlate.c code. - -Other features that need writing: - - -Documentation that needs writing: - - * API documentation - Status: - - -Available Patches: - - -Open Issues: +APACHE PORTABLE RUNTIME APR-ICONV LIBRARY STATUS: -*- coding: utf-8 -*- +Last modified at [$Date: 2007-11-26 22:52:06 +0100 (pon, 26 stu 2007) $] + +Releases: + 1.2.2 : in development + 1.2.1 : released November 26, 2007 + 1.2.0 : released June 7, 2007 + 1.1.1 : released November 23, 2005 + 1.1.0 : not released + 1.0.1 : released November 19, 2004 + 1.0.0 : released September 1, 2004 + 0.9.7 : released October 11, 2005 + 0.9.6 : not released + 0.9.5 : released November 16, 2004 + 0.9.4 : released September 26, 2003 + 0.9.3 : tagged March 30, 2002 + 0.9.2 : released March 22, 2002 (alpha) + +RELEASE SHOWSTOPPERS: + + +RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: + + * Drop modules.c code and replace much functionality with the + apr dso methods, etc. + +Other bugs that need fixing: + + * APR-util ./testall demonstrates that on finalization (when the + users calls with NULL inbuf and their target outbuf) that the + utf-7 converter doesn't exit the shift-state. Not certain that + this is in fact a bug in the code, an unimplemented feature or + a mistaken assumption in the apr-util/test/testxlate.c code. + +Other features that need writing: + + +Documentation that needs writing: + + * API documentation + Status: + + +Available Patches: + + +Open Issues: Property changes on: trunk/srclib/apr-iconv/STATUS ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/srclib/apr-iconv/libapriconv.rc =================================================================== --- trunk/srclib/apr-iconv/libapriconv.rc 2007-12-11 12:55:09 UTC (rev 1171) +++ trunk/srclib/apr-iconv/libapriconv.rc 2007-12-11 12:57:39 UTC (rev 1172) @@ -1,66 +1,66 @@ -#include "api_version.h" - -#define API_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ - "Foundation or its licensors, as applicable." - -#define API_LICENSE "Licensed under the Apache License, Version 2.0 " \ - "(the ""License""); you may not use this file except " \ - "in compliance with the License. You may obtain a " \ - "copy of the License at\r\n\r\n" \ - "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ - "Unless required by applicable law or agreed to in " \ - "writing, software distributed under the License is " \ - "distributed on an ""AS IS"" BASIS, WITHOUT " \ - "WARRANTIES OR CONDITIONS OF ANY KIND, either " \ - "express or implied. See the License for the " \ - "specific language governing permissions and " \ - "limitations under the License." - -#define API_DLL_BASENAME "libapriconv-" API_STRINGIFY(API_MAJOR_VERSION) - - -1 VERSIONINFO - FILEVERSION API_VERSION_STRING_CSV,0 - PRODUCTVERSION API_VERSION_STRING_CSV,0 - FILEFLAGSMASK 0x3fL -#if defined(API_IS_DEV_VERSION) -#if defined(_DEBUG) - FILEFLAGS 0x03L -#else - FILEFLAGS 0x02L -#endif -#else -#if defined(_DEBUG) - FILEFLAGS 0x01L -#else - FILEFLAGS 0x00L -#endif -#endif -#if defined(WINNT) || defined(WIN64) - FILEOS 0x40004L -#else - FILEOS 0x4L -#endif - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", API_LICENSE "\0" - VALUE "CompanyName", "Apache Software Foundation\0" - VALUE "FileDescription", "Apache Portable Runtime Library\0" - VALUE "FileVersion", API_VERSION_STRING "\0" - VALUE "InternalName", API_DLL_BASENAME "\0" - VALUE "LegalCopyright", API_COPYRIGHT "\0" - VALUE "OriginalFilename", API_DLL_BASENAME ".dll\0" - VALUE "ProductName", "Apache Portable Runtime Project\0" - VALUE "ProductVersion", API_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#include "api_version.h" + +#define API_COPYRIGHT "Copyright 2000-2005 The Apache Software " \ + "Foundation or its licensors, as applicable." + +#define API_LICENSE "Licensed under the Apache License, Version 2.0 " \ + "(the ""License""); you may not use this file except " \ + "in compliance with the License. You may obtain a " \ + "copy of the License at\r\n\r\n" \ + "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \ + "Unless required by applicable law or agreed to in " \ + "writing, software distributed under the License is " \ + "distributed on an ""AS IS"" BASIS, WITHOUT " \ + "WARRANTIES OR CONDITIONS OF ANY KIND, either " \ + "express or implied. See the License for the " \ + "specific language governing permissions and " \ + "limitations under the License." + +#define API_DLL_BASENAME "libapriconv-" API_STRINGIFY(API_MAJOR_VERSION) + + +1 VERSIONINFO + FILEVERSION API_VERSION_STRING_CSV,0 + PRODUCTVERSION API_VERSION_STRING_CSV,0 + FILEFLAGSMASK 0x3fL +#if defined(API_IS_DEV_VERSION) +#if defined(_DEBUG) + FILEFLAGS 0x03L +#else + FILEFLAGS 0x02L +#endif +#else +#if defined(_DEBUG) + FILEFLAGS 0x01L +#else + FILEFLAGS 0x00L +#endif +#endif +#if defined(WINNT) || defined(WIN64) + FILEOS 0x40004L +#else + FILEOS 0x4L +#endif + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", API_LICENSE "\0" + VALUE "CompanyName", "Apache Software Foundation\0" + VALUE "FileDescription", "Apache Portable Runtime Library\0" + VALUE "FileVersion", API_VERSION_STRING "\0" + VALUE "InternalName", API_DLL_BASENAME "\0" + VALUE "LegalCopyright", API_COPYRIGHT "\0" + VALUE "OriginalFilename", API_DLL_BASENAME ".dll\0" + VALUE "ProductName", "Apache Portable Runtime Project\0" + VALUE "ProductVersion", API_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Property changes on: trunk/srclib/apr-iconv/libapriconv.rc ___________________________________________________________________ Name: svn:eol-style + native

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1169 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 06:04:54 -0500 (Tue, 11 Dec 2007) New Revision: 1169 Added: trunk/build/unix/buildbin.rhel-httpd.sh Log: Add logic to build the sources. Added: trunk/build/unix/buildbin.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildbin.rhel-httpd.sh (rev 0) +++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-11 11:04:54 UTC (rev 1169) @@ -0,0 +1,127 @@ +#!/bin/sh +# Copyright(c) 2007 Red Hat Middleware, LLC, +# and individual contributors as indicated by the @authors tag. +# See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library in the file COPYING.LIB; +# if not, write to the Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# @author Jean-Frederic Clere +# @author Mladen Turk +# +echo "" +echo "Running : `basename $0` $LastChangedDate: 2007-07-02 16:22:00 +0200 (Mon, 02 Jul 2007) $" +echo "" +echo "Started : `date`" +echo "Common : $1" +echo "Prefix : $2" +echo "Output : $3" +echo "OpenSSL : $4" +echo "" + + +# parameters +# $1: Location of the common libraries. +# $2: Destination location. +# $3: Location where to put the binaries. +# $4: Use OpenSSL. + +common_loc=$1 +prefix_loc=$2 +output_loc=$3 +has_openssl=$4 +current_loc=`pwd` + +# +# Function from the httpd.spec file +# removed for easy testing. +# --with-apr=${_prefix} --with-apr-util=${_prefix} \ +function mpmbuild() +{ +mpm=$1; shift +mkdir $mpm; pushd $mpm +../configure \ + --prefix=${_sysconfdir}/httpd \ + --exec-prefix=${_prefix} \ + --bindir=${_bindir} \ + --sbindir=${_sbindir} \ + --mandir=${_mandir} \ + --libdir=${_libdir} \ + --sysconfdir=${_sysconfdir}/httpd/conf \ + --includedir=${_includedir}/httpd \ + --libexecdir=${_libdir}/httpd/modules \ + --datadir=${contentdir} \ + --with-installbuilddir=${_libdir}/httpd/build \ + --with-mpm=$mpm \ + --enable-suexec --with-suexec \ + --with-suexec-caller=${suexec_caller} \ + --with-suexec-docroot=${contentdir} \ + --with-suexec-logfile=${_localstatedir}/log/httpd/suexec.log \ + --with-suexec-bin=${_sbindir}/suexec \ + --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ + --enable-pie \ + --with-pcre \ + $* + +make +popd +} + +# +# Set needed variables. (defaulted to hacked values). +PREFIX=/opt/jboss/httpd +_sysconfdir=${PREFIX}/conf +_prefix=${PREFIX} +_sbindir=${PREFIX}/sbin +_bindir=${PREFIX}/bin +_mandir=${PREFIX}/man +_libdir=${PREFIX}/lib +_sysconfdir=${PREFIX}/conf +_includedir=${PREFIX}/include +contentdir=${PREFIX}/htdocs +suexec_caller=${PREFIX}/bin/suexec +_localstatedir=${PREFIX}/logs + +if $has_openssl ; then + add_conf="--with-ssl=${common_loc} --enable-ssl --with-ssl --enable-distcache" +else + add_conf="--with-ssl=no" + add_conf="" +fi +echo "Building prefork and mpm" +native_sources=srclib/`ls srclib | grep httpd-` +cd $native_sources +# Build everything and the kitchen sink with the prefork build +# removed because of ldap dependencies. +# --enable-ldap --enable-authnz-ldap \ +mpmbuild prefork \ + --enable-mods-shared=all \ + ${add_conf} \ + --enable-proxy \ + --enable-cache --enable-mem-cache \ + --enable-file-cache --enable-disk-cache \ + --enable-cgid \ + --enable-authn-anon --enable-authn-alias + +# For the other MPMs, just build httpd and no optional modules +mpmbuild worker --enable-modules=none + +# Install it +RPM_BUILD_ROOT=$output_loc +pushd prefork +make DESTDIR=$RPM_BUILD_ROOT install +popd +install -m 755 worker/httpd ${RPM_BUILD_ROOT}/${_sbindir}/httpd.worker Property changes on: trunk/build/unix/buildbin.rhel-httpd.sh ___________________________________________________________________ Name: svn:executable + *

16 years, 5 months

2
1
0 / 0

JBoss Native SVN: r1170 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 06:24:28 -0500 (Tue, 11 Dec 2007) New Revision: 1170 Modified: trunk/build/unix/buildsrc.rhel-httpd.sh Log: Port to Solaris. Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 11:04:54 UTC (rev 1169) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 11:24:28 UTC (rev 1170) @@ -65,6 +65,9 @@ sum="NONE" if [ -f ${fname} ]; then sum=`openssl md5 ${fname} | awk ' { print $2 } '` + if [ "x${sum}" = "x" ];then + sum=`md5sum ${fname} | awk ' { print $1 } '` + fi fi if [ ${dir} = ${sum} ]; then echo "$fname already available" @@ -81,8 +84,8 @@ # Read the patches list and apply them WHERE=${native_dist}/tools mkdir -p ${WHERE} -grep ^%patch ${rhel_loc}/httpd.spec | sed 's:%:@:' | sed 's: :@ :' | awk ' { print $1 " " $2 } ' > ${WHERE}/patch.cmd -grep ^Patch ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed 's/:/@/' | awk ' { print "s:" $1 ": patch -i @DIR@" $2 ":" } ' > ${WHERE}/patch.files +grep "^%patch" ${rhel_loc}/httpd.spec | sed 's:%:@:' | sed 's: :@ :' | awk ' { print $1 " " $2 } ' > ${WHERE}/patch.cmd +grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed 's/:/@/' | awk ' { print "s:" $1 ": patch -i @DIR@" $2 ":" } ' > ${WHERE}/patch.files sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:" > ${WHERE}/patch.sh echo "Applying the rhel patches to ${dirsources}" chmod a+x ${WHERE}/patch.sh

16 years, 5 months

1
0
0 / 0

JBoss Native SVN: r1168 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-11 06:03:59 -0500 (Tue, 11 Dec 2007) New Revision: 1168 Modified: trunk/build/unix/buildsrc.rhel-httpd.sh Log: Don't download the sources if they are already there. Modified: trunk/build/unix/buildsrc.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 08:37:44 UTC (rev 1167) +++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 11:03:59 UTC (rev 1168) @@ -62,7 +62,16 @@ # http://cvs.devel.redhat.com/repo/dist/httpd/httpd-2.2.3.tar.gz/f72ffb176e... fname=`cat ${rhel_loc}/sources | awk '{ print $2 }'` dir=`cat ${rhel_loc}/sources | awk '{ print $1 }'` -wget --tries=0 --retry-connrefused http://cvs.devel.redhat.com/repo/dist/httpd/${fname}/${dir}/${fname} +sum="NONE" +if [ -f ${fname} ]; then + sum=`openssl md5 ${fname} | awk ' { print $2 } '` +fi +if [ ${dir} = ${sum} ]; then + echo "$fname already available" +else + rm -f $fname + wget --tries=0 --retry-connrefused http://cvs.devel.redhat.com/repo/dist/httpd/${fname}/${dir}/${fname} +fi gunzip -c ${fname} | tar -xf - dirsources=`gunzip -c ${fname} | tar -tf - | head -1 | awk '{ print $1 }'` mv ${dirsources} ${native_dist}/srclib @@ -79,4 +88,10 @@ chmod a+x ${WHERE}/patch.sh (cd ${dirsources} ${WHERE}/patch.sh -) +) + +# +# regenerate configure scripts +(cd ${dirsources} + autoheader && autoconf || exit 1 +)

16 years, 5 months

1
0
0 / 0

← Newer
1
...
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits December 2007