Define u16_casefold as a wrapper around u16_ct_casefold.

diff --git a/ChangeLog b/ChangeLog
index cb931ac..d7b2633 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-06-29  Bruno Haible  <bruno@clisp.org>
 
+       Define u16_casefold as a wrapper around u16_ct_casefold.
+       * lib/unicase/u16-casefold.c: Update.
+       * modules/unicase/u16-casefold (Depends-on): Add
+       unicase/u16-ct-casefold, unicase/empty-prefix-context,
+       unicase/empty-suffix-context. Clean up.
+
        Define u8_casefold as a wrapper around u8_ct_casefold.
        * lib/unicase/u-casefold.h (FUNC): Delegate to U_CT_CASEFOLD.
        * lib/unicase/u8-casefold.c: Update.

diff --git a/lib/unicase/u16-casefold.c b/lib/unicase/u16-casefold.c
index f95c55c..5552275 100644 (file)
--- a/lib/unicase/u16-casefold.c
+++ b/lib/unicase/u16-casefold.c
@@ -20,16 +20,7 @@
 /* Specification.  */
 #include "unicase.h"
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "unicasemap.h"
-#include "special-casing.h"
-#include "casefold.h"
-
 #define FUNC u16_casefold
 #define UNIT uint16_t
-#define U_CASEMAP u16_casemap
-#define U_NORMALIZE u16_normalize
+#define U_CT_CASEFOLD u16_ct_casefold
 #include "u-casefold.h"

diff --git a/modules/unicase/u16-casefold b/modules/unicase/u16-casefold
index b385c62..2d5ade2 100644 (file)
--- a/modules/unicase/u16-casefold
+++ b/modules/unicase/u16-casefold
@@ -7,12 +7,9 @@ lib/unicase/u-casefold.h
 
 Depends-on:
 unicase/base
-unicase/u16-casemap
-unicase/special-casing
-unicase/tocasefold
-uninorm/decomposing-form
-uninorm/u16-normalize
-uninorm/nfd
+unicase/u16-ct-casefold
+unicase/empty-prefix-context
+unicase/empty-suffix-context
 
 configure.ac: