Mercurial > hg > octave-nkf > gnulib-hg
changeset 9416:0e31cd75201b
Define and declare u{8,16}_uctomb_aux also if !HAVE_INLINE.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 28 Oct 2007 21:45:28 +0100 |
parents | 8ea12c7d7d59 |
children | 95cbd64f5138 |
files | ChangeLog lib/unistr.h lib/unistr/u16-uctomb-aux.c lib/unistr/u8-uctomb-aux.c |
diffstat | 4 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/lib/unistr.h +++ b/lib/unistr.h @@ -297,12 +297,13 @@ 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 @@ #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) {