Define and declare u{8,16}_uctomb_aux also if !HAVE_INLINE.

diff --git a/ChangeLog b/ChangeLog
index b60f305..47e858b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-28  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+            Bruno Haible  <bruno@clisp.org>
+
+       * lib/unistr.h (u8_uctomb_aux): Declare also if !HAVE_INLINE.
+       (u16_uctomb_aux): Likewise.
+       * lib/unistr/u8-uctomb-aux.c (u8_uctomb_aux): Define also if
+       !HAVE_INLINE.
+       * lib/unistr/u16-uctomb-aux.c (u16_uctomb_aux): Likewise
+
 2007-10-28  Bruno Haible  <bruno@clisp.org>
 
        * modules/error: Add a notice recommending to change XGETTEXT_OPTIONS.

diff --git a/lib/unistr.h b/lib/unistr.h
index a645292..ae247a5 100644 (file)
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -297,12 +297,13 @@ extern int
    must be specified.  */
 
 #ifdef GNULIB_UNISTR_U8_UCTOMB
+/* Auxiliary function, also used by u8_chr, u8_strchr, u8_strrchr.  */
+extern int
+       u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
 # if !HAVE_INLINE
 extern int
        u8_uctomb (uint8_t *s, ucs4_t uc, int n);
 # else
-extern int
-       u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n);
 static inline int
 u8_uctomb (uint8_t *s, ucs4_t uc, int n)
 {
@@ -318,12 +319,13 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n)
 #endif
 
 #ifdef GNULIB_UNISTR_U16_UCTOMB
+/* Auxiliary function, also used by u16_chr, u16_strchr, u16_strrchr.  */
+extern int
+       u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
 # if !HAVE_INLINE
 extern int
        u16_uctomb (uint16_t *s, ucs4_t uc, int n);
 # else
-extern int
-       u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n);
 static inline int
 u16_uctomb (uint16_t *s, ucs4_t uc, int n)
 {

diff --git a/lib/unistr/u16-uctomb-aux.c b/lib/unistr/u16-uctomb-aux.c
index 1ad86aa..384452b 100644 (file)
--- a/lib/unistr/u16-uctomb-aux.c
+++ b/lib/unistr/u16-uctomb-aux.c
@@ -20,8 +20,6 @@
 /* Specification.  */
 #include "unistr.h"
 
-#if HAVE_INLINE
-
 int
 u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n)
 {
@@ -58,5 +56,3 @@ u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n)
     }
   return -2;
 }
-
-#endif

diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c
index f38bc23..c42fa50 100644 (file)
--- a/lib/unistr/u8-uctomb-aux.c
+++ b/lib/unistr/u8-uctomb-aux.c
@@ -20,8 +20,6 @@
 /* Specification.  */
 #include "unistr.h"
 
-#if HAVE_INLINE
-
 int
 u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
 {
@@ -69,5 +67,3 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n)
     }
   return count;
 }
-
-#endif