citrus: compile in UTF16/32 support for iconv.

diff --git a/lib/libc/citrus/Makefile.inc b/lib/libc/citrus/Makefile.inc
index 8bb313a..d76dde4 100644 (file)
--- a/lib/libc/citrus/Makefile.inc
+++ b/lib/libc/citrus/Makefile.inc
@@ -29,5 +29,5 @@ SRCS+= citrus_${var:L}.c
 CFLAGS+=-D_I18N_STATIC_${var}
 .endfor
 # iconv support
-SRCS+=citrus_iconv_std.c citrus_mapper_std.c citrus_mapper_serial.c
+SRCS+=citrus_iconv_std.c citrus_mapper_std.c citrus_mapper_none.c citrus_mapper_serial.c
 .endif # STATIC_LOCALES

diff --git a/lib/libc/citrus/citrus_module.c b/lib/libc/citrus/citrus_module.c
index 2ef549f..672e43a 100644 (file)
--- a/lib/libc/citrus/citrus_module.c
+++ b/lib/libc/citrus/citrus_module.c
@@ -345,9 +345,12 @@ _citrus_unload_module(_citrus_module_t handle)
 #include "citrus_region.h"
 #include "citrus_iconv_local.h"
 #include "citrus_mapper_local.h"
+#include "citrus_stdenc_local.h"
 #include "modules/citrus_mapper_serial.h"
 #include "modules/citrus_mapper_std.h"
+#include "modules/citrus_mapper_none.h"
 #include "modules/citrus_iconv_std.h"
+#include "modules/citrus_utf1632.h"
 
 #ifdef _I18N_STATIC_BIG5
 #include "modules/citrus_big5.h"
@@ -382,6 +385,8 @@ struct citrus_metadata module_table[] = {
  _CITRUS_MODULE_TABLE_ENTRY(iconv_std, iconv),
  _CITRUS_MODULE_TABLE_ENTRY(mapper_std, mapper),
  _CITRUS_MODULE_TABLE_ENTRY(mapper_serial, mapper),
+ _CITRUS_MODULE_TABLE_ENTRY(mapper_none, mapper),
+ _CITRUS_MODULE_TABLE_ENTRY(UTF1632, stdenc),
 #ifdef _I18N_STATIC_BIG5
  _CITRUS_LOCALE_TABLE_ENTRY(BIG5),
 #endif