jbossnative-commits December 2007

jbossnative-commits@lists.jboss.org

2 participants
107 discussions

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

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 13:26:33 -0500 (Thu, 13 Dec 2007) New Revision: 1208 Added: trunk/httpd/NMAKElibhttpd trunk/httpd/NMAKEmakefile Removed: trunk/httpd/NMAKEhttpd trunk/httpd/NMAKEmakefile trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch Log: Rename make files Deleted: trunk/httpd/NMAKEhttpd =================================================================== --- trunk/httpd/NMAKEhttpd 2007-12-13 17:07:34 UTC (rev 1207) +++ trunk/httpd/NMAKEhttpd 2007-12-13 18:26:33 UTC (rev 1208) @@ -1,117 +0,0 @@ -# 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 HTTPD makefile. -# Usage: -# DEBUG=1 Build DEBUG version of HTTPD -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - - -TARGET=EXE -PROJECT = httpd - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <NMAKEcommon.inc> - -LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib - -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src -OBJECTS = \ - $(WORKDIR)\main.obj - -HEADERS = \ - $(SRCDIR)\include\os.h \ - $(SRCDIR)\include\mpm.h \ - $(SRCDIR)\include\mpm_default.h - -BUILDLIB = $(PREFIX)\lib - -BUILDBIN = $(WORKDIR)\$(PROJECT).exe -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest - -RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" - -BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll -BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll -BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll -BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib - - -all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) - -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(WORKDIR) : - @$(MAKEWORKDIR) - -.SUFFIXES : .h - -$(BUILDAPR) : - cd $(SRCDIR)\srclib\apr - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDAPU) : - cd $(SRCDIR)\srclib\apr-util - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDAPI) : - cd $(SRCDIR)\srclib\apr-iconv - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDPCRE) : - cd $(SRCDIR)\srclib\pcre - $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 - cd ..\.. - -{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(SRCDIR)\include\os.h: - @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL - -$(SRCDIR)\include\mpm.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL - -$(SRCDIR)\include\mpm_default.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL - -$(BUILDRES): build\win32\httpd.rc - $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc -$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 -clean: - @$(CLEANTARGET) - -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL Copied: trunk/httpd/NMAKElibhttpd (from rev 1205, trunk/httpd/NMAKEmakefile) =================================================================== --- trunk/httpd/NMAKElibhttpd (rev 0) +++ trunk/httpd/NMAKElibhttpd 2007-12-13 18:26:33 UTC (rev 1208) @@ -0,0 +1,116 @@ +# 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 HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=DLL +PROJECT = libhttpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Deleted: trunk/httpd/NMAKEmakefile =================================================================== --- trunk/httpd/NMAKEmakefile 2007-12-13 17:07:34 UTC (rev 1207) +++ trunk/httpd/NMAKEmakefile 2007-12-13 18:26:33 UTC (rev 1208) @@ -1,116 +0,0 @@ -# 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 HTTPD makefile. -# Usage: -# DEBUG=1 Build DEBUG version of HTTPD -# -# Originally contributed by Mladen Turk <mturk redhat.com> -# -# ==================================================================== -# - - -TARGET=DLL -PROJECT = libhttpd - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <NMAKEcommon.inc> - -LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)" -LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib - -INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include -PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src -OBJECTS = \ - $(WORKDIR)\main.obj - -HEADERS = \ - $(SRCDIR)\include\os.h \ - $(SRCDIR)\include\mpm.h \ - $(SRCDIR)\include\mpm_default.h - -BUILDLIB = $(PREFIX)\lib - -BUILDBIN = $(WORKDIR)\$(PROJECT).dll -BUILDPDB = $(WORKDIR)\$(PROJECT).pdb -BUILDRES = $(WORKDIR)\$(PROJECT).res -BUILDMAN = $(BUILDBIN).manifest - -RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core" - -BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll -BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll -BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll -BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib - -all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) - -$(BUILDLIB) : - @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" - -$(WORKDIR) : - @$(MAKEWORKDIR) - -.SUFFIXES : .h - -$(BUILDAPR) : - cd $(SRCDIR)\srclib\apr - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDAPU) : - cd $(SRCDIR)\srclib\apr-util - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDAPI) : - cd $(SRCDIR)\srclib\apr-iconv - $(MAKE) -f NMAKEmakefile - cd ..\.. - -$(BUILDPCRE) : - cd $(SRCDIR)\srclib\pcre - $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 - cd ..\.. - -{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(SRCDIR)\include\os.h: - @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL - -$(SRCDIR)\include\mpm.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL - -$(SRCDIR)\include\mpm_default.h: - @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL - -$(BUILDRES): build\win32\httpd.rc - $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc -$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 -clean: - @$(CLEANTARGET) - -install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) - @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Copied: trunk/httpd/NMAKEmakefile (from rev 1205, trunk/httpd/NMAKEhttpd) =================================================================== --- trunk/httpd/NMAKEmakefile (rev 0) +++ trunk/httpd/NMAKEmakefile 2007-12-13 18:26:33 UTC (rev 1208) @@ -0,0 +1,117 @@ +# 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 HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=EXE +PROJECT = httpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL Deleted: trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch =================================================================== --- trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch 2007-12-13 17:07:34 UTC (rev 1207) +++ trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch 2007-12-13 18:26:33 UTC (rev 1208) @@ -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));

17 years

1
0
0 / 0

JBoss Native SVN: r1207 - trunk/httpd/srclib/apr-iconv.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 12:07:34 -0500 (Thu, 13 Dec 2007) New Revision: 1207 Added: trunk/httpd/srclib/apr-iconv/apr-iconv.patch Log: Make that versionless Copied: trunk/httpd/srclib/apr-iconv/apr-iconv.patch (from rev 1206, trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch) =================================================================== --- trunk/httpd/srclib/apr-iconv/apr-iconv.patch (rev 0) +++ trunk/httpd/srclib/apr-iconv/apr-iconv.patch 2007-12-13 17:07:34 UTC (rev 1207) @@ -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));

17 years

1
0
0 / 0

JBoss Native SVN: r1206 - trunk/httpd/srclib/apr-iconv.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 12:06:50 -0500 (Thu, 13 Dec 2007) New Revision: 1206 Added: trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch Log: Add iconv patch Added: trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch =================================================================== --- trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch (rev 0) +++ trunk/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch 2007-12-13 17:06:50 UTC (rev 1206) @@ -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/httpd/srclib/apr-iconv/apr-iconv-1.2.1.patch ___________________________________________________________________ Name: svn:eol-style + LF

17 years

1
0
0 / 0

JBoss Native SVN: r1205 - in trunk: httpd and 6 other directories.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 12:05:23 -0500 (Thu, 13 Dec 2007) New Revision: 1205 Added: trunk/httpd/ trunk/httpd/NMAKEcommon.inc trunk/httpd/NMAKEhttpd trunk/httpd/NMAKEmakefile trunk/httpd/srclib/ trunk/httpd/srclib/apr-iconv/ trunk/httpd/srclib/apr-iconv/NMAKEmakefile trunk/httpd/srclib/apr-util/ trunk/httpd/srclib/apr-util/NMAKEmakefile trunk/httpd/srclib/apr/ trunk/httpd/srclib/apr/NMAKEmakefile trunk/httpd/srclib/pcre/ trunk/httpd/srclib/pcre/NMAKEmakefile trunk/httpd/srclib/pcre/chartables.c trunk/httpd/srclib/zlib/ trunk/httpd/srclib/zlib/NMAKEmakefile Log: Windows build files. Just the tip of the ice berg :) Added: trunk/httpd/NMAKEcommon.inc =================================================================== --- trunk/httpd/NMAKEcommon.inc (rev 0) +++ trunk/httpd/NMAKEcommon.inc 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,312 @@ +# Copyright 2001-2006 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. +# +# ==================================================================== +# +# NMAKEcommon.inc Master makefile definitions. +# This file defines CPU architecture and basic compiler +# and linker parameters. +# Common params: +# CPU Compile for specified CPU. Supported CPU's are: +# i386 +# AMD64 +# IA64 +# If not specified it will default to the +# PROCESSOR_ARCHITECTURE environment variable +# or to the i386 if not specified. +# WINVER Compile for specified Windows version +# WINNT for Windows 2000 and up(default) +# WINXP for Windows XP and up +# WIN2003 for Windows 2003 and up +# VSITA for Windows Vista and up +# Deprecated targets (may not even compile): +# NT4 for Windows NT4 and up +# WIN9X for Windows 95, 98 and Me +# BUILD Build version +# RETAIL or RELEASE (default) +# DEBUG +# TARGET Build application target +# EXE Console executable (default) +# GUI Windows GUI executable +# DLL Dynamic Link Library +# LIB Static library +# Environment variables used: +# CFLAGS Added to the common CFLAGS +# CPPFLAGS Added to the common CPPFLAGS +# LIBS Added to the common LIBS +# INCLUDES Added to the common INCLUDES +# LFLAGS Added to the common LFLAGS +# RCFLAGS Added to the common RCFLAGS +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(CC) || "$(CC)" == "" +CC = cl.exe +!ENDIF + +!IF !DEFINED(LINK) || "$(LINK)" == "" +LINK = link.exe +!ENDIF + +!IF !DEFINED(RC) || "$(RC)" == "" +RC = rc.exe +!ENDIF + +# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type + +!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" == "x86" || "$(BUILDCPU)" == "i686" +CPU=I386 +!ENDIF +!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" == "x86_64" +CPU=AMD64 +!ENDIF +!IF "$(BUILDCPU)" == "ia64" +CPU=IA64 +!ENDIF + +!IF !DEFINED(CPU) || "$(CPU)" == "" +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +CPU=I386 +!ELSE +CPU=$(PROCESSOR_ARCHITECTURE) +!ENDIF +!ENDIF + +!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "AMD64" +!IF "$(CPU)" != "IA64" +!ERROR Must specify CPU environment variable (I386, AMD64, IA64) $(CPU) +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(TARGET) || "$(TARGET)" == "" +TARGET=EXE +!ENDIF + +!IF "$(TARGET)" != "EXE" +!IF "$(TARGET)" != "GUI" +!IF "$(TARGET)" != "DLL" +!IF "$(TARGET)" != "LIB" +!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB) +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF !DEFINED(WINVER) || "$(WINVER)" == "" +WINVER=WINXP +!ENDIF + + +!IF "$(WINVER)" != "WINNT" +!IF "$(WINVER)" != "WINXP" +!IF "$(WINVER)" != "WIN2003" +!IF "$(WINVER)" != "NT4" +!IF "$(WINVER)" != "WIN9X" +!IF "$(WINVER)" != "WVSITA" +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X) +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF "$(WINVER)" == "WINNT" +NMAKE_WINVER = 0x0500 +_WIN32_IE = 0x0500 +!ELSEIF "$(WINVER)" == "WINXP" +NMAKE_WINVER = 0x0501 +_WIN32_IE = 0x0600 +!ELSEIF "$(WINVER)" == "WIN2003" +NMAKE_WINVER = 0x0502 +_WIN32_IE = 0x0600 +!ELSEIF "$(WINVER)" == "VSITA" +NMAKE_WINVER = 0x0600 +_WIN32_IE = 0x0700 +!ELSEIF "$(WINVER)" == "NT4" +NMAKE_WINVER = 0x0400 +_WIN32_IE = 0x0400 +!ELSE +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X) +!ENDIF + +!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == "" +NMAKE_WINVER = 0x0400 +_WIN32_IE = 0x0400 +NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) +!ELSE +NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) +!ENDIF + +!IF !DEFINED(BUILD) || "$(BUILD)" == "" +BUILD=RELEASE +!ENDIF + +!IFDEF RELEASE +BUILD=RELEASE +!ENDIF + +!IFDEF DEBUG +BUILD=DEBUG +!ENDIF + +!IFDEF NODEBUG +BUILD=RELEASE +!ENDIF + +!IF "$(BUILD)" != "RELEASE" +!IF "$(BUILD)" != "DEBUG" +!ERROR Must specify BUILD environment variable (RELEASE, DEBUG) +!ENDIF +!ENDIF + +# Common flags for all platforms +CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3 + +!IF "$(CPU)" == "I386" +CPU_CFLAGS = -D_X86_=1 +!ELSEIF "$(CPU)" == "AMD64" +CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 +!ELSEIF "$(CPU)" == "IA64" +CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 +!ENDIF + +!IF "$(INCLUDE_PRE64PRA)" == "1" +!IF "$(CPU)" != "I386" +CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H +!ENDIF +!ENDIF + +!IF "$(BUILD)" == "RELEASE" +!IF "$(CPU)" == "I386" +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +!ELSE +OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG +!ENDIF +!ELSE +OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG +!ENDIF + +!IF DEFINED(STATIC_CRT) +CRT_CFLAGS = -D_MT -MT +!ELSE +CRT_CFLAGS = -D_MT -MD +!ENDIF + +!IF "$(BUILD)" == "DEBUG" +CRT_CFLAGS = $(CRT_CFLAGS)d +!ENDIF + +CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS) + +!IF DEFINED(EXTRA_CFLAGS) +CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) +!ENDIF + + +# Linker section +LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS) +!IF "$(INCLUDE_BUFFEROVERFLOWU)" == "1" +!IF "$(CPU)" != "I386" +LIBS = $(LIBS) bufferoverflowu.lib +!ENDIF +!ENDIF + +!IF DEFINED(EXTRA_LIBS) +LIBS = $(LIBS) $(EXTRA_LIBS) +!ENDIF + +COMMON_LFLAGS = /NOLOGO + +# Always add debugging to the linker +OPT_LFLAGS = /INCREMENTAL:NO /DEBUG +!IF "$(BUILD)" == "RELEASE" +OPT_LFLAGS = /OPT:REF +!ENDIF + +!IF "$(TARGET)" == "EXE" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "GUI" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "DLL" +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "LIB" +LFLAGS = -lib $(COMMON_LFLAGS) +!ENDIF + +!IF DEFINED(EXTRA_LFLAGS) +LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS) +!ENDIF + +!IF "$(TARGET)" != "LIB" +LFLAGS = $(LFLAGS) $(OPT_LFLAGS) +!ENDIF + +# Resource compiler flags + +BASE_RCFLAGS=/l 0x409 +!IF "$(BUILD)" == "RELEASE" +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG" +!ELSE +BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG" +!ENDIF +RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS) + +# Build Target dir e.g. WINNT_I386_RELEASE_DLL +!IF !DEFINED(WORKDIR) || "$(WORKDIR)" == "" +!IF !DEFINED(WORKDIR_EXT) || "$(WORKDIR_EXT)" == "" +WORKDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) +WORKDIR_DLL = $(WINVER)_$(CPU)_DLL_$(BUILD) +WORKDIR_LIB = $(WINVER)_$(CPU)_LIB_$(BUILD) +WORKDIR_EXE = $(WINVER)_$(CPU)_EXE_$(BUILD) +!ELSE +WORKDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) +!ENDIF +!ENDIF + +!IF "$(OS)" == "Windows_NT" +CLEANTARGET=if exist "$(WORKDIR)\$(NULL)" rd /s /q $(WORKDIR) +!ELSE +CLEANTARGET=deltree /y $(BUILDIR) +!ENDIF + +MAKEWORKDIR=if not exist "$(WORKDIR)\$(NULL)" mkdir $(WORKDIR) +MAKEINSTALL=if not exist "$(INSTALLLOC)" mkdir $(INSTALLLOC) + +!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" +JAVA_INCLUDES=-I "$(JAVA_HOME)\include" +!IF "$(CPU)" != "I386" +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win64" +!ENDIF +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win32" +!ENDIF + +!IF !DEFINED(ML) || "$(ML)" == "" +!IF "$(CPU)" == "I386" +ML = ml.exe +AFLAGS = /coff /Zi /c +!ELSEIF "$(CPU)" == "AMD64" +ML = ml64.exe +AFLAGS = /Zi /c +!ELSEIF "$(CPU)" == "IA64" +ML = ml64.exe +AFLAGS = /coff /Zi /c +!ENDIF +!ENDIF Property changes on: trunk/httpd/NMAKEcommon.inc ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/NMAKEhttpd =================================================================== --- trunk/httpd/NMAKEhttpd (rev 0) +++ trunk/httpd/NMAKEhttpd 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,117 @@ +# 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 HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=EXE +PROJECT = httpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).exe +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).exe" /d LONG_NAME="Apache HTTP Server" /d ICON_FILE="apache.ico" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR_DLL)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR_DLL)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR_DLL)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.exe" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/NMAKEhttpd ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/NMAKEmakefile =================================================================== --- trunk/httpd/NMAKEmakefile (rev 0) +++ trunk/httpd/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,116 @@ +# 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 HTTPD makefile. +# Usage: +# DEBUG=1 Build DEBUG version of HTTPD +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +TARGET=DLL +PROJECT = libhttpd + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <NMAKEcommon.inc> + +LDIRS = /libpath:"$(SRCDIR)\srclib\apr\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-iconv\$(WORKDIR)" /libpath:"$(SRCDIR)\srclib\apr-util\$(WORKDIR)" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib libapr-1.lib libapriconv-1.lib libaprutil-1.lib + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\srclib\apr\include -I$(SRCDIR)\srclib\apr-util\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\main.obj + +HEADERS = \ + $(SRCDIR)\include\os.h \ + $(SRCDIR)\include\mpm.h \ + $(SRCDIR)\include\mpm_default.h + +BUILDLIB = $(PREFIX)\lib + +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest + +RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).dll" /d LONG_NAME="Apache HTTP Server Core" + +BUILDAPR = $(SRCDIR)\srclib\apr\$(WORKDIR)\libapr-1.dll +BUILDAPI = $(SRCDIR)\srclib\apr-iconv\$(WORKDIR)\libapriconv-1.dll +BUILDAPU = $(SRCDIR)\srclib\apr-util\$(WORKDIR)\libaprutil-1.dll +BUILDPCRE = $(SRCDIR)\srclib\pcre\$(WORKDIR_LIB)\pcre.lib + +all : $(WORKDIR) $(BUILDLIB) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .h + +$(BUILDAPR) : + cd $(SRCDIR)\srclib\apr + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPU) : + cd $(SRCDIR)\srclib\apr-util + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDAPI) : + cd $(SRCDIR)\srclib\apr-iconv + $(MAKE) -f NMAKEmakefile + cd ..\.. + +$(BUILDPCRE) : + cd $(SRCDIR)\srclib\pcre + $(MAKE) -f NMAKEmakefile PCRE_STATIC=1 + cd ..\.. + +{$(SRCDIR)\server}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(SRCDIR)\include\os.h: + @copy /Y $(SRCDIR)\os\win32\os.h $@ >NUL + +$(SRCDIR)\include\mpm.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm.h $@ >NUL + +$(SRCDIR)\include\mpm_default.h: + @copy /Y $(SRCDIR)\server\mpm\winnt\mpm_default.h $@ >NUL + +$(BUILDRES): build\win32\httpd.rc + $(RC) $(RCFLAGS) /i "$(SRCDIR)\build\win32" /i "$(SRCDIR)\include" /i "$(SRCDIR)\srclib\apr\include" /fo $(BUILDRES) build\win32\httpd.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(BUILDAPR) $(BUILDAPI) $(BUILDAPU) $(BUILDPCRE) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,228 @@ +# 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 makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) +PROJECT = libapr-1 +!ELSE +TARGET=LIB +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +PROJECT = apr-1 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch -I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\apr_atomic.obj \ + $(WORKDIR)\dso.obj \ + $(WORKDIR)\copy.obj \ + $(WORKDIR)\dir.obj \ + $(WORKDIR)\fileacc.obj \ + $(WORKDIR)\filedup.obj \ + $(WORKDIR)\filepath.obj \ + $(WORKDIR)\filepath_util.obj \ + $(WORKDIR)\filestat.obj \ + $(WORKDIR)\filesys.obj \ + $(WORKDIR)\flock.obj \ + $(WORKDIR)\fullrw.obj \ + $(WORKDIR)\mktemp.obj \ + $(WORKDIR)\open.obj \ + $(WORKDIR)\pipe.obj \ + $(WORKDIR)\readwrite.obj \ + $(WORKDIR)\seek.obj \ + $(WORKDIR)\tempdir.obj \ + $(WORKDIR)\proc_mutex.obj \ + $(WORKDIR)\thread_cond.obj \ + $(WORKDIR)\thread_mutex.obj \ + $(WORKDIR)\thread_rwlock.obj \ + $(WORKDIR)\apr_pools.obj \ + $(WORKDIR)\charset.obj \ + $(WORKDIR)\env.obj \ + $(WORKDIR)\errorcodes.obj \ + $(WORKDIR)\getopt.obj \ + $(WORKDIR)\internal.obj \ + $(WORKDIR)\misc.obj \ + $(WORKDIR)\otherchild.obj \ + $(WORKDIR)\rand.obj \ + $(WORKDIR)\start.obj \ + $(WORKDIR)\utf8.obj \ + $(WORKDIR)\version.obj \ + $(WORKDIR)\common.obj \ + $(WORKDIR)\mmap.obj \ + $(WORKDIR)\inet_ntop.obj \ + $(WORKDIR)\inet_pton.obj \ + $(WORKDIR)\select.obj \ + $(WORKDIR)\multicast.obj \ + $(WORKDIR)\sendrecv.obj \ + $(WORKDIR)\sockaddr.obj \ + $(WORKDIR)\sockets.obj \ + $(WORKDIR)\sockopt.obj \ + $(WORKDIR)\apr_getpass.obj \ + $(WORKDIR)\apr_random.obj \ + $(WORKDIR)\sha2.obj \ + $(WORKDIR)\sha2_glue.obj \ + $(WORKDIR)\shm.obj \ + $(WORKDIR)\apr_cpystrn.obj \ + $(WORKDIR)\apr_fnmatch.obj \ + $(WORKDIR)\apr_snprintf.obj \ + $(WORKDIR)\apr_strings.obj \ + $(WORKDIR)\apr_strnatcmp.obj \ + $(WORKDIR)\apr_strtok.obj \ + $(WORKDIR)\apr_hash.obj \ + $(WORKDIR)\apr_tables.obj \ + $(WORKDIR)\proc.obj \ + $(WORKDIR)\signals.obj \ + $(WORKDIR)\thread.obj \ + $(WORKDIR)\threadpriv.obj \ + $(WORKDIR)\access.obj \ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ + $(WORKDIR)\userinfo.obj + +HEADERS = $(SRCDIR)\include\apr.h + +BUILDINC = $(PREFIX)\include +BUILDLIB = $(PREFIX)\lib +!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 : $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw + +{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dso\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\locks\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\memory\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\passwd}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\poll\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\random\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\shmem\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\strings}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\tables}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\threadproc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\time\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\user\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\arch\*.h $(SRCDIR)\include\arch\win32\*.h $(SRCDIR)\include\arch\unix\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapr.rc $(HEADERS) $(SRCDIR)\include\*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y /Q + @xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/apr/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr-iconv/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-iconv/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr-iconv/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +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 redhat.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 +WITH_APR = ..\apr +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" + +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 +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 + +!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 : $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + +$(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/httpd/srclib/apr-iconv/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/apr-util/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/apr-util/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,223 @@ +# 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-UTIL makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT -DAPU_DECLARE_EXPORT -DAPI_DECLARE_EXPORT $(CFLAGS) +PROJECT = libaprutil-1 +APR_LIB = libapr-1.lib +API_LIB = libapriconv-1.lib +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC -DAPI_DECLARE_STATIC $(CFLAGS) +PROJECT = aprutil-1 +APR_LIB = apr-1.lib +API_LIB = apriconv-1.lib +TARGET=LIB +!ENDIF + +CFLAGS = $(CFLAGS) -DAPU_USE_SDBM -DVERSION=\"expat_1.95.2\" + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IFNDEF WITH_APR +WITH_APR=..\apr +!ENDIF + +!IFNDEF WITH_API +WITH_API=..\apr-iconv +!ENDIF + +LDIRS = /libpath:"$(WITH_APR)\$(WORKDIR)" /libpath:"$(WITH_API)\$(WORKDIR)" + +LFLAGS = $(LFLAGS) $(APR_LIB) $(API_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)\include\private -I$(SRCDIR)\xml\expat\lib -I$(WITH_APR)\include -I$(WITH_API)\include +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\apr_brigade.obj \ + $(WORKDIR)\apr_buckets.obj \ + $(WORKDIR)\apr_buckets_alloc.obj \ + $(WORKDIR)\apr_buckets_eos.obj \ + $(WORKDIR)\apr_buckets_file.obj \ + $(WORKDIR)\apr_buckets_flush.obj \ + $(WORKDIR)\apr_buckets_heap.obj \ + $(WORKDIR)\apr_buckets_mmap.obj \ + $(WORKDIR)\apr_buckets_pipe.obj \ + $(WORKDIR)\apr_buckets_pool.obj \ + $(WORKDIR)\apr_buckets_refcount.obj \ + $(WORKDIR)\apr_buckets_simple.obj \ + $(WORKDIR)\apr_buckets_socket.obj \ + $(WORKDIR)\apr_md4.obj \ + $(WORKDIR)\apr_md5.obj \ + $(WORKDIR)\apr_sha1.obj \ + $(WORKDIR)\getuuid.obj \ + $(WORKDIR)\uuid.obj \ + $(WORKDIR)\apr_dbd.obj \ + $(WORKDIR)\apr_dbd_pgsql.obj \ + $(WORKDIR)\apr_dbd_sqlite2.obj \ + $(WORKDIR)\apr_dbd_sqlite3.obj \ + $(WORKDIR)\apr_dbm.obj \ + $(WORKDIR)\apr_dbm_berkeleydb.obj \ + $(WORKDIR)\apr_dbm_gdbm.obj \ + $(WORKDIR)\apr_dbm_sdbm.obj \ + $(WORKDIR)\sdbm.obj \ + $(WORKDIR)\sdbm_hash.obj \ + $(WORKDIR)\sdbm_lock.obj \ + $(WORKDIR)\sdbm_pair.obj \ + $(WORKDIR)\apr_base64.obj \ + $(WORKDIR)\apr_hooks.obj \ + $(WORKDIR)\apr_ldap_init.obj \ + $(WORKDIR)\apr_ldap_url.obj \ + $(WORKDIR)\apr_ldap_option.obj \ + $(WORKDIR)\apr_date.obj \ + $(WORKDIR)\apr_queue.obj \ + $(WORKDIR)\apr_reslist.obj \ + $(WORKDIR)\apr_rmm.obj \ + $(WORKDIR)\apu_version.obj \ + $(WORKDIR)\apr_strmatch.obj \ + $(WORKDIR)\apr_uri.obj \ + $(WORKDIR)\xlate.obj \ + $(WORKDIR)\apr_xml.obj \ + $(WORKDIR)\xmlparse.obj \ + $(WORKDIR)\xmlrole.obj \ + $(WORKDIR)\xmltok.obj + +HEADERS = \ + $(SRCDIR)\include\apu.h \ + $(SRCDIR)\include\apu_want.h \ + $(SRCDIR)\include\apr_ldap.h \ + $(SRCDIR)\include\private\apu_config.h \ + $(SRCDIR)\include\private\apu_select_dbm.h \ + $(SRCDIR)\xml\expat\lib\config.h \ + $(SRCDIR)\xml\expat\lib\expat.h + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include + +!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 : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw .h.in + +{$(SRCDIR)\include}.hw{$(SRCDIR)\include}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\xml\expat\lib}.h.in{$(SRCDIR)\xml\expat\lib}.h: + @copy /Y $< $@ >NUL + +{$(SRCDIR)\include\private}.hw{$(SRCDIR)\include\private}.h: + @copy /Y $< $@ >NUL + +$(SRCDIR)\xml\expat\lib\config.h : + @copy /Y $(SRCDIR)\xml\expat\lib\winconfig.h $@ >NUL + +{$(SRCDIR)\buckets}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\crypto}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbd}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbm}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dbm\sdbm}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\encoding}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\hooks}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\ldap}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\strmatch}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\uri}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xlate}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xml}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\xml\expat\lib}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\private\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libaprutil.rc $(HEADERS) + $(RC) $(RCFLAGS) /i "$(WITH_APR)\include" /i "$(SRCDIR)\include" /d "APU_VERSION_ONLY" /fo $(BUILDRES) libaprutil.rc +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(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) $(HEADERS) $(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/httpd/srclib/apr-util/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/pcre/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/pcre/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/pcre/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,107 @@ +# 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 PCRRE makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of PCRE +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + + +!IF !DEFINED(PCRE_STATIC) || "$(PCRE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DPCRE_DEFINITION -DDLL_EXPORT $(CFLAGS) +PROJECT = libpcre +!ELSE +CFLAGS = -DPCRE_STATIC $(CFLAGS) +PROJECT = pcre +TARGET=LIB +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IF "$(TARGET)" == "DLL" +LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib +!ENDIF + +INCLUDES = -I$(SRCDIR) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\get.obj \ + $(WORKDIR)\maketables.obj \ + $(WORKDIR)\pcre.obj \ + $(WORKDIR)\study.obj + +HEADERS = \ + $(SRCDIR)\pcre.h \ + $(SRCDIR)\config.h + + +BUILDLIB = $(PREFIX)\lib +BUILDINC = $(PREFIX)\include + +!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 : $(BUILDLIB) $(WORKDIR) $(HEADERS) $(BUILDBIN) + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +.SUFFIXES : .hw + +{$(SRCDIR)}.hw{$(SRCDIR)}.h: + @copy /Y $< $@ >NUL +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(HEADERS) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(LDIRS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\pcre.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL Property changes on: trunk/httpd/srclib/pcre/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/pcre/chartables.c =================================================================== --- trunk/httpd/srclib/pcre/chartables.c (rev 0) +++ trunk/httpd/srclib/pcre/chartables.c 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,183 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* This file is automatically written by the dftables auxiliary +program. If you edit it by hand, you might like to edit the Makefile to +prevent its ever being regenerated. + +This file is #included in the compilation of pcre.c to build the default +character tables which are used when no tables are passed to the compile +function. */ + +static unsigned char pcre_default_tables[] = { + +/* This table is a lower casing table. */ + + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, + 64, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122, 91, 92, 93, 94, 95, + 96, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122,123,124,125,126,127, + 128,129,130,131,132,133,134,135, + 136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151, + 152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167, + 168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183, + 184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199, + 200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215, + 216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231, + 232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247, + 248,249,250,251,252,253,254,255, + +/* This table is a case flipping table. */ + + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, + 64, 97, 98, 99,100,101,102,103, + 104,105,106,107,108,109,110,111, + 112,113,114,115,116,117,118,119, + 120,121,122, 91, 92, 93, 94, 95, + 96, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90,123,124,125,126,127, + 128,129,130,131,132,133,134,135, + 136,137,138,139,140,141,142,143, + 144,145,146,147,148,149,150,151, + 152,153,154,155,156,157,158,159, + 160,161,162,163,164,165,166,167, + 168,169,170,171,172,173,174,175, + 176,177,178,179,180,181,182,183, + 184,185,186,187,188,189,190,191, + 192,193,194,195,196,197,198,199, + 200,201,202,203,204,205,206,207, + 208,209,210,211,212,213,214,215, + 216,217,218,219,220,221,222,223, + 224,225,226,227,228,229,230,231, + 232,233,234,235,236,237,238,239, + 240,241,242,243,244,245,246,247, + 248,249,250,251,252,253,254,255, + +/* This table contains bit maps for various character classes. +Each map is 32 bytes long and the bits run from the least +significant end of each byte. The classes that have their own +maps are: space, xdigit, digit, upper, lower, word, graph +print, punct, and cntrl. Other classes are built from combinations. */ + + 0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0x7e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xfe,0xff,0xff,0x07,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0x07, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x03, + 0xfe,0xff,0xff,0x87,0xfe,0xff,0xff,0x07, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xfe,0xff,0xff,0xff, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff, + 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0x00,0x00,0x00,0x00,0xfe,0xff,0x00,0xfc, + 0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x78, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + + 0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + +/* This table identifies various classes of character by individual bits: + 0x01 white space character + 0x02 letter + 0x04 decimal digit + 0x08 hexadecimal digit + 0x10 alphanumeric or '_' + 0x80 regular expression metacharacter or binary zero +*/ + + 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0- 7 */ + 0x00,0x01,0x01,0x00,0x01,0x01,0x00,0x00, /* 8- 15 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 16- 23 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 24- 31 */ + 0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /* - ' */ + 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /* ( - / */ + 0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /* 0 - 7 */ + 0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /* 8 - ? */ + 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* @ - G */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* H - O */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* P - W */ + 0x12,0x12,0x12,0x80,0x00,0x00,0x80,0x10, /* X - _ */ + 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* ` - g */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* h - o */ + 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* p - w */ + 0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /* x -127 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 152-159 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 160-167 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 168-175 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 176-183 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 184-191 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 192-199 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 200-207 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 208-215 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 216-223 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 224-231 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 232-239 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 240-247 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */ + +/* End of chartables.c */ Property changes on: trunk/httpd/srclib/pcre/chartables.c ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/httpd/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/httpd/srclib/zlib/NMAKEmakefile (rev 0) +++ trunk/httpd/srclib/zlib/NMAKEmakefile 2007-12-13 17:05:23 UTC (rev 1205) @@ -0,0 +1,150 @@ +# Copyright 2001-2006 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 Zlib makefile. +# Usage: +# DLL=1 Build DLL version +# ASM=1 Use Masm +# DEBUG=1 Build DEBUG version of Zlib +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == "" +TARGET=DLL +PROJECT = libzlib-1 +CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ELSE +TARGET=LIB +PROJECT = zlib-1 +CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ENDIF + +!IF "$(CPU)" != "I386" +CFLAGS = -GS- $(CFLAGS) +!ENDIF + +# CFLAGS = -wd4996 $(CFLAGS) + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adler32.obj \ + $(WORKDIR)\compress.obj \ + $(WORKDIR)\crc32.obj \ + $(WORKDIR)\deflate.obj \ + $(WORKDIR)\gzio.obj \ + $(WORKDIR)\infback.obj \ + $(WORKDIR)\inffast.obj \ + $(WORKDIR)\inflate.obj \ + $(WORKDIR)\inftrees.obj \ + $(WORKDIR)\trees.obj \ + $(WORKDIR)\uncompr.obj \ + $(WORKDIR)\zutil.obj + +!IFDEF ZLIB_ASM +CFLAGS = -DASMV -DASMINF $(CFLAGS) +!IF "$(CPU)" == "AMD64" +ASM_OBJECTS = \ + $(WORKDIR)\inffas8664.obj \ + $(WORKDIR)\gvmat64.obj \ + $(WORKDIR)\inffas64.obj + +!ELSE +ASM_OBJECTS = \ + $(WORKDIR)\gvmat32c.obj \ + $(WORKDIR)\gvmat32.obj \ + $(WORKDIR)\inffas32.obj + +!ENDIF +!ELSE +ASM_OBJECTS = +!ENDIF + +BUILDINC = $(PREFIX)\include\apr-1 +BUILDLIB = $(PREFIX)\lib +!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) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +!IF "$(CPU)" == "AMD64" +{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx64}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ELSE +{$(SRCDIR)/contrib/masmx86}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx86}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ENDIF + + +$(OBJECTS): $(SRCDIR)/*.h + +!IFDEF DLL +$(BUILDRES): win32/zlib1.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL

17 years

1
0
0 / 0

JBoss Native SVN: r1204 - trunk and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-13 11:41:58 -0500 (Thu, 13 Dec 2007) New Revision: 1204 Added: sandbox/httpd-aloha/ Removed: trunk/httpd/ Log: Move httpd to sandbox. Copied: sandbox/httpd-aloha (from rev 1183, trunk/httpd)

17 years

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-13 11:40:44 -0500 (Thu, 13 Dec 2007) New Revision: 1203 Modified: trunk/build/unix/util/builddep.linux2.sh trunk/build/unix/util/builddep.solaris.sh Log: sort uniq otherwise LD_LIBRARY_PATH grows too much. Modified: trunk/build/unix/util/builddep.linux2.sh =================================================================== --- trunk/build/unix/util/builddep.linux2.sh 2007-12-13 14:26:37 UTC (rev 1202) +++ trunk/build/unix/util/builddep.linux2.sh 2007-12-13 16:40:44 UTC (rev 1203) @@ -27,7 +27,7 @@ # $2: ouput file. # $3: work directory location LD_LIBRARY_PATH=$1 -for dir in `find $1 -name "*.so" -exec dirname {} \;` +for dir in `find $1 -name "*.so" -exec dirname {} \; | sort -u` do LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir done Modified: trunk/build/unix/util/builddep.solaris.sh =================================================================== --- trunk/build/unix/util/builddep.solaris.sh 2007-12-13 14:26:37 UTC (rev 1202) +++ trunk/build/unix/util/builddep.solaris.sh 2007-12-13 16:40:44 UTC (rev 1203) @@ -27,7 +27,7 @@ # $2: ouput file. # $3: work directory. LD_LIBRARY_PATH=$1 -for dir in `find $1 -name "*.${so_extension}" -exec dirname {} \;` +for dir in `find $1 -name "*.${so_extension}" -exec dirname {} \; | sort -u` do LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir done

17 years

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-12-13 09:26:37 -0500 (Thu, 13 Dec 2007) New Revision: 1202 Modified: trunk/build/unix/buildbin.rhel-httpd.sh Log: ../configure does not work on dev24. bash ../configure does. Modified: trunk/build/unix/buildbin.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-13 13:03:47 UTC (rev 1201) +++ trunk/build/unix/buildbin.rhel-httpd.sh 2007-12-13 14:26:37 UTC (rev 1202) @@ -54,7 +54,7 @@ mpm=$1; shift mkdir $mpm (cd $mpm -../configure \ +bash ../configure \ --prefix=${_sysconfdir}/httpd \ --exec-prefix=${_prefix} \ --bindir=${_bindir} \ @@ -75,7 +75,6 @@ --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ --with-pcre \ $* - make ) || exit 1 } @@ -83,13 +82,12 @@ # # Set needed variables. (defaulted to hacked values). PREFIX=/opt/jboss/httpd -_sysconfdir=${PREFIX}/conf +_sysconfdir=${PREFIX} _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

17 years

2
1
0 / 0

JBoss Native SVN: r1201 - trunk/srclib/zlib.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 08:03:47 -0500 (Thu, 13 Dec 2007) New Revision: 1201 Modified: trunk/srclib/zlib/NMAKEmakefile Log: Remove extra compiler directives Modified: trunk/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/srclib/zlib/NMAKEmakefile 2007-12-13 12:54:07 UTC (rev 1200) +++ trunk/srclib/zlib/NMAKEmakefile 2007-12-13 13:03:47 UTC (rev 1201) @@ -40,8 +40,6 @@ CFLAGS = -GS- $(CFLAGS) !ENDIF -CFLAGS = -wd4996 $(CFLAGS) - !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" SRCDIR = . !ENDIF @@ -64,7 +62,7 @@ $(WORKDIR)\uncompr.obj \ $(WORKDIR)\zutil.obj -!IFDEF ASM +!IFDEF ZLIB_ASM CFLAGS = -DASMV -DASMINF $(CFLAGS) !IF "$(CPU)" == "AMD64" ASM_OBJECTS = \

17 years

1
0
0 / 0

JBoss Native SVN: r1200 - trunk/srclib/zlib.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 07:54:07 -0500 (Thu, 13 Dec 2007) New Revision: 1200 Modified: trunk/srclib/zlib/NMAKEmakefile Log: Use same file naming as for apr libraries Modified: trunk/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/srclib/zlib/NMAKEmakefile 2007-12-13 12:44:24 UTC (rev 1199) +++ trunk/srclib/zlib/NMAKEmakefile 2007-12-13 12:54:07 UTC (rev 1200) @@ -28,11 +28,11 @@ !IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == "" TARGET=DLL -PROJECT = libzlib1 +PROJECT = libzlib-1 CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) !ELSE TARGET=LIB -PROJECT = zlib1 +PROJECT = zlib-1 CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) !ENDIF

17 years

1
0
0 / 0

JBoss Native SVN: r1199 - trunk/srclib/zlib.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2007-12-13 07:44:24 -0500 (Thu, 13 Dec 2007) New Revision: 1199 Modified: trunk/srclib/zlib/NMAKEmakefile Log: Fix non i686 builds. Modified: trunk/srclib/zlib/NMAKEmakefile =================================================================== --- trunk/srclib/zlib/NMAKEmakefile 2007-12-13 10:36:37 UTC (rev 1198) +++ trunk/srclib/zlib/NMAKEmakefile 2007-12-13 12:44:24 UTC (rev 1199) @@ -29,13 +29,17 @@ !IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == "" TARGET=DLL PROJECT = libzlib1 -CFLAGS = -DZLIB_DECLARE_EXPORT $(CFLAGS) +CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) !ELSE TARGET=LIB PROJECT = zlib1 -CFLAGS = -DZLIB_DECLARE_STATIC $(CFLAGS) +CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) !ENDIF +!IF "$(CPU)" != "I386" +CFLAGS = -GS- $(CFLAGS) +!ENDIF + CFLAGS = -wd4996 $(CFLAGS) !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""

17 years

1
0
0 / 0

← Newer
1
...
4
5
6
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