From e09579d0ab2c6d1527f8c19a280d83574b56e7ab Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Oct 2007 21:45:28 +0100 Subject: [PATCH] Define and declare u{8,16}_uctomb_aux also if !HAVE_INLINE. --- ChangeLog | 9 +++++++++ lib/unistr.h | 10 ++++++---- lib/unistr/u16-uctomb-aux.c | 4 ---- lib/unistr/u8-uctomb-aux.c | 4 ---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b60f305f3..47e858b3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-10-28 Ralf Wildenhues + Bruno Haible + + * 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 * modules/error: Add a notice recommending to change XGETTEXT_OPTIONS. diff --git a/lib/unistr.h b/lib/unistr.h index a645292c0..ae247a5ea 100644 --- 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 1ad86aa08..384452ba1 100644 --- 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 f38bc23aa..c42fa5015 100644 --- 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 -- 2.11.0