From 8ebb4dc2e07799707815e2b7511315ef989e76ce Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Mar 2007 14:30:33 +0000
Subject: [PATCH] Rename some source files.

---
 ChangeLog                 | 21 +++++++++++++++++++++
 modules/ucs4-utf16        |  4 ++--
 modules/ucs4-utf8         |  4 ++--
 modules/utf16-ucs4        |  4 ++--
 modules/utf16-ucs4-unsafe |  4 ++--
 modules/utf8-ucs4         |  4 ++--
 modules/utf8-ucs4-unsafe  |  4 ++--
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e738cd49..ea643a9f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2007-03-24  Bruno Haible  <bruno@clisp.org>
 
+	* lib/unistr/u8-mbtouc-aux.c: Renamed from lib/unistr/utf8-ucs4.c.
+	Enable the function only if HAVE_INLINE.
+	* lib/unistr/u8-mbtouc-unsafe-aux.c: Renamed from
+	lib/unistr/utf8-ucs4-unsafe.c. Enable the function only if HAVE_INLINE.
+	* lib/unistr/u16-mbtouc-aux.c: Renamed from lib/unistr/utf16-ucs4.c.
+	Enable the function only if HAVE_INLINE.
+	* lib/unistr/u16-mbtouc-unsafe-aux.c: Renamed from
+	lib/unistr/utf16-ucs4-unsafe.c. Enable the function only if HAVE_INLINE.
+	* lib/unistr/u8-uctomb-aux.c: Renamed from lib/unistr/ucs4-utf8.c.
+	Enable the function only if HAVE_INLINE.
+	* lib/unistr/u16-uctomb-aux.c: Renamed from lib/unistr/ucs4-utf16.c.
+	Enable the function only if HAVE_INLINE.
+	* modules/utf8-ucs4: Update.
+	* modules/utf8-ucs4-unsafe: Update.
+	* modules/utf16-ucs4: Update.
+	* modules/utf16-ucs4-unsafe: Update.
+	* modules/ucs4-utf8: Update.
+	* modules/ucs4-utf16: Update.
+
+2007-03-24  Bruno Haible  <bruno@clisp.org>
+
 	* lib/utf8-ucs4.h: Remove file.
 	* lib/utf8-ucs4-unsafe.h: Remove file.
 	* lib/utf16-ucs4.h: Remove file.
diff --git a/modules/ucs4-utf16 b/modules/ucs4-utf16
index 05daefb00..45c786f8d 100644
--- a/modules/ucs4-utf16
+++ b/modules/ucs4-utf16
@@ -2,7 +2,7 @@ Description:
 Conversion UCS-4 to UTF-16.
 
 Files:
-lib/unistr/ucs4-utf16.c
+lib/unistr/u16-uctomb-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/ucs4-utf16.c
+lib_SOURCES += unistr/u16-uctomb-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/ucs4-utf8 b/modules/ucs4-utf8
index 5dd97d88a..8ed1c9512 100644
--- a/modules/ucs4-utf8
+++ b/modules/ucs4-utf8
@@ -2,7 +2,7 @@ Description:
 Conversion UCS-4 to UTF-8.
 
 Files:
-lib/unistr/ucs4-utf8.c
+lib/unistr/u8-uctomb-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/ucs4-utf8.c
+lib_SOURCES += unistr/u8-uctomb-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/utf16-ucs4 b/modules/utf16-ucs4
index 998047946..9803405b0 100644
--- a/modules/utf16-ucs4
+++ b/modules/utf16-ucs4
@@ -2,7 +2,7 @@ Description:
 Conversion UTF-16 to UCS-4.
 
 Files:
-lib/unistr/utf16-ucs4.c
+lib/unistr/u16-mbtouc-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/utf16-ucs4.c
+lib_SOURCES += unistr/u16-mbtouc-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/utf16-ucs4-unsafe b/modules/utf16-ucs4-unsafe
index e438f383d..2fde2733b 100644
--- a/modules/utf16-ucs4-unsafe
+++ b/modules/utf16-ucs4-unsafe
@@ -2,7 +2,7 @@ Description:
 Conversion UTF-16 to UCS-4.
 
 Files:
-lib/unistr/utf16-ucs4-unsafe.c
+lib/unistr/u16-mbtouc-unsafe-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/utf16-ucs4-unsafe.c
+lib_SOURCES += unistr/u16-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/utf8-ucs4 b/modules/utf8-ucs4
index eb1a100a0..5a2737635 100644
--- a/modules/utf8-ucs4
+++ b/modules/utf8-ucs4
@@ -2,7 +2,7 @@ Description:
 Conversion UTF-8 to UCS-4.
 
 Files:
-lib/unistr/utf8-ucs4.c
+lib/unistr/u8-mbtouc-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/utf8-ucs4.c
+lib_SOURCES += unistr/u8-mbtouc-aux.c
 
 Include:
 "unistr.h"
diff --git a/modules/utf8-ucs4-unsafe b/modules/utf8-ucs4-unsafe
index b0417f510..649721ef3 100644
--- a/modules/utf8-ucs4-unsafe
+++ b/modules/utf8-ucs4-unsafe
@@ -2,7 +2,7 @@ Description:
 Conversion UTF-8 to UCS-4.
 
 Files:
-lib/unistr/utf8-ucs4-unsafe.c
+lib/unistr/u8-mbtouc-unsafe-aux.c
 
 Depends-on:
 unitypes
@@ -11,7 +11,7 @@ unistr/base
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += unistr/utf8-ucs4-unsafe.c
+lib_SOURCES += unistr/u8-mbtouc-unsafe-aux.c
 
 Include:
 "unistr.h"
-- 
2.11.0