From 1a75491a06af7e04ea1170d2d32dbd1c76d9c096 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 10 Apr 2009 19:50:44 +0200 Subject: [PATCH] Inside libunistring, define the function always. --- ChangeLog | 18 ++++++++++++++++++ lib/unistr/u16-mbtouc-aux.c | 4 ++-- lib/unistr/u16-mbtouc-unsafe-aux.c | 4 ++-- lib/unistr/u16-mbtouc-unsafe.c | 8 +++++++- lib/unistr/u16-mbtouc.c | 7 ++++++- lib/unistr/u16-uctomb.c | 7 ++++++- lib/unistr/u32-mbtouc-unsafe.c | 8 +++++++- lib/unistr/u32-mbtouc.c | 7 ++++++- lib/unistr/u32-uctomb.c | 7 ++++++- lib/unistr/u8-mbtouc-aux.c | 4 ++-- lib/unistr/u8-mbtouc-unsafe-aux.c | 4 ++-- lib/unistr/u8-mbtouc-unsafe.c | 8 +++++++- lib/unistr/u8-mbtouc.c | 7 ++++++- lib/unistr/u8-uctomb.c | 7 ++++++- 14 files changed, 83 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index f8cb4646e8..e4c81ffaf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2009-04-10 Bruno Haible + + * lib/unistr/u8-mbtouc-aux.c: Inside libunistring, define the function + always. + * lib/unistr/u8-mbtouc-unsafe-aux.c: Likewise. + * lib/unistr/u16-mbtouc-aux.c: Likewise. + * lib/unistr/u16-mbtouc-unsafe-aux.c: Likewise. + * lib/unistr/u8-mbtouc.c: Inside libunistring, include + "unistring-notinline.h", so that the function gets defined always. + * lib/unistr/u8-mbtouc-unsafe.c: Likewise. + * lib/unistr/u8-uctomb.c: Likewise. + * lib/unistr/u16-mbtouc.c: Likewise. + * lib/unistr/u16-mbtouc-unsafe.c: Likewise. + * lib/unistr/u16-uctomb.c: Likewise. + * lib/unistr/u32-mbtouc.c: Likewise. + * lib/unistr/u32-mbtouc-unsafe.c: Likewise. + * lib/unistr/u32-uctomb.c: Likewise. + 2009-04-10 Bruno Haible Mark 'utime' obsolete. diff --git a/lib/unistr/u16-mbtouc-aux.c b/lib/unistr/u16-mbtouc-aux.c index e056fc0cf9..5f35b86748 100644 --- a/lib/unistr/u16-mbtouc-aux.c +++ b/lib/unistr/u16-mbtouc-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-16 to UCS-4. - Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -20,7 +20,7 @@ /* Specification. */ #include "unistr.h" -#if HAVE_INLINE +#if defined IN_LIBUNISTRING || HAVE_INLINE int u16_mbtouc_aux (ucs4_t *puc, const uint16_t *s, size_t n) diff --git a/lib/unistr/u16-mbtouc-unsafe-aux.c b/lib/unistr/u16-mbtouc-unsafe-aux.c index 9a792c44bb..9906e30160 100644 --- a/lib/unistr/u16-mbtouc-unsafe-aux.c +++ b/lib/unistr/u16-mbtouc-unsafe-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-16 to UCS-4. - Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -20,7 +20,7 @@ /* Specification. */ #include "unistr.h" -#if HAVE_INLINE +#if defined IN_LIBUNISTRING || HAVE_INLINE int u16_mbtouc_unsafe_aux (ucs4_t *puc, const uint16_t *s, size_t n) diff --git a/lib/unistr/u16-mbtouc-unsafe.c b/lib/unistr/u16-mbtouc-unsafe.c index 2a6a06c934..cc858d88da 100644 --- a/lib/unistr/u16-mbtouc-unsafe.c +++ b/lib/unistr/u16-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-16 string. - Copyright (C) 1999-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,12 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u16_mbtouc_unsafe as 'extern', not + 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u16-mbtouc.c b/lib/unistr/u16-mbtouc.c index 6b7bf42ca9..2691db8361 100644 --- a/lib/unistr/u16-mbtouc.c +++ b/lib/unistr/u16-mbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-16 string. - Copyright (C) 1999-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u16_mbtouc as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u16-uctomb.c b/lib/unistr/u16-uctomb.c index 88a4c21d51..6ac5ada5d3 100644 --- a/lib/unistr/u16-uctomb.c +++ b/lib/unistr/u16-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-16 string. - Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u16_uctomb as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u32-mbtouc-unsafe.c b/lib/unistr/u32-mbtouc-unsafe.c index f9859e0dc8..4bd9e817c8 100644 --- a/lib/unistr/u32-mbtouc-unsafe.c +++ b/lib/unistr/u32-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-32 string. - Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,12 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u32_mbtouc_unsafe as 'extern', not + 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u32-mbtouc.c b/lib/unistr/u32-mbtouc.c index 76b1a644ab..4eeef58c13 100644 --- a/lib/unistr/u32-mbtouc.c +++ b/lib/unistr/u32-mbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-32 string. - Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u32_mbtouc as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u32-uctomb.c b/lib/unistr/u32-uctomb.c index b04370c81b..583b3b6690 100644 --- a/lib/unistr/u32-uctomb.c +++ b/lib/unistr/u32-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-32 string. - Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u32_uctomb as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u8-mbtouc-aux.c b/lib/unistr/u8-mbtouc-aux.c index 54d562fd98..53d02bf0df 100644 --- a/lib/unistr/u8-mbtouc-aux.c +++ b/lib/unistr/u8-mbtouc-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -20,7 +20,7 @@ /* Specification. */ #include "unistr.h" -#if HAVE_INLINE +#if defined IN_LIBUNISTRING || HAVE_INLINE int u8_mbtouc_aux (ucs4_t *puc, const uint8_t *s, size_t n) diff --git a/lib/unistr/u8-mbtouc-unsafe-aux.c b/lib/unistr/u8-mbtouc-unsafe-aux.c index 5d800edfb9..43e4a360f0 100644 --- a/lib/unistr/u8-mbtouc-unsafe-aux.c +++ b/lib/unistr/u8-mbtouc-unsafe-aux.c @@ -1,5 +1,5 @@ /* Conversion UTF-8 to UCS-4. - Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -20,7 +20,7 @@ /* Specification. */ #include "unistr.h" -#if HAVE_INLINE +#if defined IN_LIBUNISTRING || HAVE_INLINE int u8_mbtouc_unsafe_aux (ucs4_t *puc, const uint8_t *s, size_t n) diff --git a/lib/unistr/u8-mbtouc-unsafe.c b/lib/unistr/u8-mbtouc-unsafe.c index 8fb5440db5..4661569674 100644 --- a/lib/unistr/u8-mbtouc-unsafe.c +++ b/lib/unistr/u8-mbtouc-unsafe.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,12 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u8_mbtouc_unsafe as 'extern', not + 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u8-mbtouc.c b/lib/unistr/u8-mbtouc.c index 6259443990..ff624f17d6 100644 --- a/lib/unistr/u8-mbtouc.c +++ b/lib/unistr/u8-mbtouc.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string. - Copyright (C) 1999-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u8_mbtouc as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index 265fe53644..33921669e8 100644 --- a/lib/unistr/u8-uctomb.c +++ b/lib/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -17,6 +17,11 @@ #include +#if defined IN_LIBUNISTRING +/* Tell unistr.h to declare u8_uctomb as 'extern', not 'static inline'. */ +# include "unistring-notinline.h" +#endif + /* Specification. */ #include "unistr.h" -- 2.30.2