# endif
#endif
-#ifdef GNULIB_UNISTR_U16_MBTOUC
+#ifdef GNULIB_UNISTR_U16_MBTOUC_UNSAFE
# if !HAVE_INLINE
extern int
- u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
+ u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
# else
-# include "utf16-ucs4.h"
+# include "utf16-ucs4-unsafe.h"
# endif
#endif
-#ifdef GNULIB_UNISTR_U32_MBTOUC
+#ifdef GNULIB_UNISTR_U32_MBTOUC_UNSAFE
# if !HAVE_INLINE
extern int
- u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
+ u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n);
# else
static inline int
-u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n)
+u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n)
{
uint32_t c = *s;
# endif
#endif
-#ifdef GNULIB_UNISTR_U16_MBTOUC_SAFE
+#ifdef GNULIB_UNISTR_U16_MBTOUC
# if !HAVE_INLINE
extern int
- u16_mbtouc_safe (ucs4_t *puc, const uint16_t *s, size_t n);
+ u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
# else
-# include "utf16-ucs4-safe.h"
+# include "utf16-ucs4.h"
# endif
#endif
-#ifdef GNULIB_UNISTR_U32_MBTOUC_SAFE
+#ifdef GNULIB_UNISTR_U32_MBTOUC
# if !HAVE_INLINE
extern int
- u32_mbtouc_safe (ucs4_t *puc, const uint32_t *s, size_t n);
+ u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n);
# else
static inline int
-u32_mbtouc_safe (ucs4_t *puc, const uint32_t *s, size_t n)
+u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n)
{
uint32_t c = *s;