X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr.h;h=5643ea72b42b26d7ac02916e074dae8ba62b8663;hb=39bc7a80b6719b1c7d0f8fb1b01380649cb8e358;hp=a67e5939d5a9c5cf417eb40f39efa94ec5b49697;hpb=00065b7cd8ec54f7d94a60b2fcf8b3ce87bea953;p=gnulib.git

diff --git a/lib/unistr.h b/lib/unistr.h
index a67e5939d..5643ea72b 100644
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -141,22 +141,22 @@ extern int
 # 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;
 
@@ -174,31 +174,31 @@ u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n)
 # endif
 #endif
 
-#ifdef GNULIB_UNISTR_U8_MBTOUC_SAFE
+#ifdef GNULIB_UNISTR_U8_MBTOUC
 # if !HAVE_INLINE
 extern int
-       u8_mbtouc_safe (ucs4_t *puc, const uint8_t *s, size_t n);
+       u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
 # else
-#  include "utf8-ucs4-safe.h"
+#  include "utf8-ucs4.h"
 # 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;