Define u32_casefold as a wrapper around u32_ct_casefold.

diff --git a/ChangeLog b/ChangeLog
index d7b26331ce445e84c2215eb892fd5a0d3f149edb..94a811bbe60de0316e6f8e26e9e7cd8f89d0ae78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-06-29  Bruno Haible  <bruno@clisp.org>
 
+       Define u32_casefold as a wrapper around u32_ct_casefold.
+       * lib/unicase/u32-casefold.c: Update.
+       * modules/unicase/u32-casefold (Depends-on): Add
+       unicase/u32-ct-casefold, unicase/empty-prefix-context,
+       unicase/empty-suffix-context. Clean up.
+
        Define u16_casefold as a wrapper around u16_ct_casefold.
        * lib/unicase/u16-casefold.c: Update.
        * modules/unicase/u16-casefold (Depends-on): Add

diff --git a/lib/unicase/u32-casefold.c b/lib/unicase/u32-casefold.c
index feda177e68cd141b910c38485f11010bd562816e..aff44f82eaef251e1342791b5fe521bfce361e62 100644 (file)
--- a/lib/unicase/u32-casefold.c
+++ b/lib/unicase/u32-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 u32_casefold
 #define UNIT uint32_t
-#define U_CASEMAP u32_casemap
-#define U_NORMALIZE u32_normalize
+#define U_CT_CASEFOLD u32_ct_casefold
 #include "u-casefold.h"

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