Inside libunistring, define the function always.

diff --git a/ChangeLog b/ChangeLog
index f8cb4646e82803eabfbee4855bb9363355af09b1..e4c81ffaf6b4ae506231755c00afb4a3e0e43888 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-04-10  Bruno Haible  <bruno@clisp.org>
+
+       * 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  <bruno@clisp.org>
 
        Mark 'utime' obsolete.

diff --git a/lib/unistr/u16-mbtouc-aux.c b/lib/unistr/u16-mbtouc-aux.c
index e056fc0cf999d05e76d94cdc65ed1f08abca358d..5f35b867481ba47719d120bd581d83313855409a 100644 (file)
--- 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 <bruno@clisp.org>, 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 9a792c44bb6e4b2458c28b3d01654416bff575be..9906e30160f8040e6ceb1d2f9032aefc2d7bc83a 100644 (file)
--- 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 <bruno@clisp.org>, 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 2a6a06c934e32680644e719627c52cbb0ec8871a..cc858d88dac4e8464c1672aef82f2283e91b0575 100644 (file)
--- 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 <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,12 @@
 
 #include <config.h>
 
+#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 6b7bf42ca9dc1b5e514194a594117f1139b9f325..2691db8361aeedf4fab4d75d056832ec660709de 100644 (file)
--- 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 <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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 88a4c21d513eb2cfc4e60ad45573bad7251ae481..6ac5ada5d3d80473abcd400c5d1b4f45d7536cdb 100644 (file)
--- 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 <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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 f9859e0dc8fc46cc137e8b80f09a5da24f571c58..4bd9e817c8d2940ebc5c2eaf3a69f01b50f81255 100644 (file)
--- 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 <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,12 @@
 
 #include <config.h>
 
+#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 76b1a644aba814cfb3fe5503ceea969cddc410f6..4eeef58c13eefe8e77d2bc62f76e3b446092d4c8 100644 (file)
--- 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 <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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 b04370c81b5037d7499ab33f8c1100c4cb734fed..583b3b66904b37f1dd7d2145f9eb5266ddf0bb05 100644 (file)
--- 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 <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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 54d562fd9846e346c85a3cf1f0f4657013c16c33..53d02bf0dfee790fe8747c6a907308919d81b2f5 100644 (file)
--- 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 <bruno@clisp.org>, 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 5d800edfb90c8426fe2f02ff259d93ddc30be517..43e4a360f0fc9f0cdc0bba33f6e4b3951880d061 100644 (file)
--- 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 <bruno@clisp.org>, 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 8fb5440db527989a8bda3ea5aa2d5d4816e1178a..4661569674252101cdba75dc537d63b9765f88f9 100644 (file)
--- 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 <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,12 @@
 
 #include <config.h>
 
+#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 625944399046cf88cd7d074e34bbacf23a34fbe2..ff624f17d61351907f2bcc0a67456ac5db122294 100644 (file)
--- 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 <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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 265fe536444b620b1b498f77407d0ac74af8de37..33921669e8e545a3e96aef65ecb5e0a236de3aa2 100644 (file)
--- 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 <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#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"