[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
clean up utf8-ucs4 vs. unistr redundancy
From: |
Bruno Haible |
Subject: |
clean up utf8-ucs4 vs. unistr redundancy |
Date: |
Sat, 24 Mar 2007 15:16:32 +0100 |
User-agent: |
KMail/1.5.4 |
Hi,
Compiling with -Wall gave me these warnings:
ucs4-utf16.h:33: warning: static declaration for `u16_uctomb' follows non-static
ucs4-utf16.h:33: warning: static declaration for `u16_uctomb' follows non-static
ucs4-utf16.h:33: warning: static declaration for `u16_uctomb' follows non-static
ucs4-utf8.h:33: warning: static declaration for `u8_uctomb' follows non-static
ucs4-utf8.h:33: warning: static declaration for `u8_uctomb' follows non-static
ucs4-utf8.h:33: warning: static declaration for `u8_uctomb' follows non-static
The fix is
1. to remove the ucs4-utf16.h, ucs4-utf8.h etc. include files, replacing
them with unistr.h,
2. to take care of HAVE_INLINE where necessary,
3. to synchronize the source file names and module descriptions.
Here's the first part of it (showing only the relevant ChangeLog and NEWS
entries).
2007-03-24 Bruno Haible <address@hidden>
* lib/utf8-ucs4.h: Remove file.
* lib/utf8-ucs4-unsafe.h: Remove file.
* lib/utf16-ucs4.h: Remove file.
* lib/utf16-ucs4-unsafe.h: Remove file.
* lib/ucs4-utf8.h: Remove file.
* lib/ucs4-utf16.h: Remove file.
* lib/unistr.h: Include their previous contents.
* m4/utf-ucs4.m4: Remove file.
* m4/ucs4-utf.m4: Remove file.
* modules/utf8-ucs4 (Files): Remove lib/utf8-ucs4.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UTF_UCS4.
(Makefile.am): Update.
(Include): Change to unistr.h.
* modules/utf8-ucs4-unsafe (Files): Remove lib/utf8-ucs4-unsafe.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UTF_UCS4.
(Makefile.am): Update.
(Include): Change to unistr.h.
* modules/utf16-ucs4 (Files): Remove lib/utf16-ucs4.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UTF_UCS4.
(Makefile.am): Update.
(Include): Change to unistr.h.
* modules/utf16-ucs4-unsafe (Files): Remove lib/utf16-ucs4-unsafe.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UTF_UCS4.
(Makefile.am): Update.
(Include): Change to unistr.h.
* modules/ucs4-utf8 (Files): Remove lib/ucs4-utf8.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UCS4_UTF.
(Makefile.am): Update.
(Include): Change to unistr.h.
* modules/ucs4-utf16 (Files): Remove lib/ucs4-utf16.h.
(Depends-on): Add unistr/base.
(configure.ac): Remove gl_UCS4_UTF.
(Makefile.am): Update.
(Include): Change to unistr.h.
* lib/unistr/utf8-ucs4.c: Include unistr.h instead of utf8-ucs4.h.
* lib/unistr/utf8-ucs4-unsafe.c: Include unistr.h instead of
utf8-ucs4-unsafe.h.
* lib/unistr/utf16-ucs4.c: Include unistr.h instead of utf16-ucs4.h.
* lib/unistr/utf16-ucs4-unsafe.c: Include unistr.h instead of
utf16-ucs4-unsafe.h.
* lib/unistr/ucs4-utf8.c: Include unistr.h instead of ucs4-utf8.h.
* lib/unistr/ucs4-utf16.c: Include unistr.h instead of ucs4-utf16.h.
* lib/unistr/u8-chr.c: Don't include ucs4-utf8.h.
* lib/unistr/u8-strchr.c: Likewise.
* lib/unistr/u8-strrchr.c: Likewise.
* lib/unistr/u16-chr.c: Don't include ucs4-utf16.h.
* lib/unistr/u16-strchr.c: Likewise.
* lib/unistr/u16-strrchr.c: Likewise.
* lib/striconveh.c: Update.
Date Modules Changes
2007-03-24 utf8-ucs4 The include file is changed from "utf8-ucs4.h"
to "unistr.h".
utf8-ucs4-unsafe The include file is changed from
"utf8-ucs4-unsafe.h" to "unistr.h".
utf16-ucs4 The include file is changed from "utf16-ucs4.h"
to "unistr.h".
utf16-ucs4-unsafe The include file is changed from "utf16-ucs4.h"
to "unistr.h".
ucs4-utf8 The include file is changed from "ucs4-utf8.h"
to "unistr.h".
ucs4-utf16 The include file is changed from "ucs4-utf16.h"
to "unistr.h".
- clean up utf8-ucs4 vs. unistr redundancy,
Bruno Haible <=