+UV /* Made into a function, so can be deprecated */
+NATIVE_TO_NEED(const UV enc, const UV ch)
+{
+ PERL_UNUSED_ARG(enc);
+ return ch;
+}
+
+UV /* Made into a function, so can be deprecated */
+ASCII_TO_NEED(const UV enc, const UV ch)
+{
+ PERL_UNUSED_ARG(enc);
+ return ch;
+}
+
+bool
+Perl_is_uni_alnum(pTHX_ UV c)
+{
+ return isWORDCHAR_uni(c);
+}
+
+bool
+Perl_is_uni_alnumc(pTHX_ UV c)
+{
+ return isALNUM_uni(c);
+}
+
+bool
+Perl_is_uni_alpha(pTHX_ UV c)
+{
+ return isALPHA_uni(c);
+}
+
+bool
+Perl_is_uni_ascii(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isASCII_uni(c);
+}
+
+bool
+Perl_is_uni_blank(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isBLANK_uni(c);
+}
+
+bool
+Perl_is_uni_space(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isSPACE_uni(c);
+}
+
+bool
+Perl_is_uni_digit(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isDIGIT_uni(c);
+}
+
+bool
+Perl_is_uni_upper(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isUPPER_uni(c);
+}
+
+bool
+Perl_is_uni_lower(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isLOWER_uni(c);
+}
+
+bool
+Perl_is_uni_cntrl(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isCNTRL_L1(c);
+}
+
+bool
+Perl_is_uni_graph(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isGRAPH_uni(c);
+}
+
+bool
+Perl_is_uni_print(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isPRINT_uni(c);
+}
+
+bool
+Perl_is_uni_punct(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isPUNCT_uni(c);
+}
+
+bool
+Perl_is_uni_xdigit(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isXDIGIT_uni(c);
+}
+
+bool
+Perl_is_uni_alnum_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isWORDCHAR_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_alnumc_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isALPHANUMERIC_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_idfirst_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ /* XXX Should probably be something that resolves to the old IDFIRST, but
+ * this function is deprecated, so not bothering */
+ return isIDFIRST_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_alpha_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isALPHA_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_ascii_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isASCII_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_blank_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isBLANK_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_space_lc(pTHX_ UV c)
+{
+ PERL_UNUSED_CONTEXT;
+ return isSPACE_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_digit_lc(pTHX_ UV c)
+{
+ return isDIGIT_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_idfirst(pTHX_ UV c)
+{
+ U8 tmpbuf[UTF8_MAXBYTES+1];
+ uvchr_to_utf8(tmpbuf, c);
+ return _is_utf8_idstart(tmpbuf);
+}
+
+bool
+Perl_is_uni_upper_lc(pTHX_ UV c)
+{
+ return isUPPER_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_lower_lc(pTHX_ UV c)
+{
+ return isLOWER_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_cntrl_lc(pTHX_ UV c)
+{
+ return isCNTRL_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_graph_lc(pTHX_ UV c)
+{
+ return isGRAPH_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_print_lc(pTHX_ UV c)
+{
+ return isPRINT_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_punct_lc(pTHX_ UV c)
+{
+ return isPUNCT_LC_uvchr(c);
+}
+
+bool
+Perl_is_uni_xdigit_lc(pTHX_ UV c)
+{
+ return isXDIGIT_LC_uvchr(c);
+}
+
+U32
+Perl_to_uni_upper_lc(pTHX_ U32 c)
+{
+ /* XXX returns only the first character -- do not use XXX */
+ /* XXX no locale support yet */
+ STRLEN len;
+ U8 tmpbuf[UTF8_MAXBYTES_CASE+1];
+ return (U32)to_uni_upper(c, tmpbuf, &len);
+}
+
+U32
+Perl_to_uni_title_lc(pTHX_ U32 c)
+{
+ /* XXX returns only the first character XXX -- do not use XXX */
+ /* XXX no locale support yet */
+ STRLEN len;
+ U8 tmpbuf[UTF8_MAXBYTES_CASE+1];
+ return (U32)to_uni_title(c, tmpbuf, &len);
+}
+
+U32
+Perl_to_uni_lower_lc(pTHX_ U32 c)
+{
+ /* XXX returns only the first character -- do not use XXX */
+ /* XXX no locale support yet */
+ STRLEN len;
+ U8 tmpbuf[UTF8_MAXBYTES_CASE+1];
+ return (U32)to_uni_lower(c, tmpbuf, &len);
+}
+
+bool
+Perl_is_utf8_mark(pTHX_ const U8 *p)
+{
+ PERL_ARGS_ASSERT_IS_UTF8_MARK;
+
+ return _is_utf8_mark(p);
+}
+
+/*
+=for apidoc is_utf8_char
+
+Tests if some arbitrary number of bytes begins in a valid UTF-8
+character. Note that an INVARIANT (i.e. ASCII on non-EBCDIC machines)
+character is a valid UTF-8 character. The actual number of bytes in the UTF-8
+character will be returned if it is valid, otherwise 0.
+
+This function is deprecated due to the possibility that malformed input could
+cause reading beyond the end of the input buffer. Use L</isUTF8_CHAR>
+instead.
+
+=cut */
+
+STRLEN
+Perl_is_utf8_char(const U8 *s)
+{
+ PERL_ARGS_ASSERT_IS_UTF8_CHAR;
+
+ /* Assumes we have enough space, which is why this is deprecated. But the
+ * strnlen() makes it safe for the common case of NUL-terminated strings */
+ return isUTF8_CHAR(s, s + my_strnlen((char *) s, UTF8SKIP(s)));
+}
+
+/*
+=for apidoc is_utf8_char_buf
+
+This is identical to the macro L<perlapi/isUTF8_CHAR>.
+
+=cut */
+
+STRLEN
+Perl_is_utf8_char_buf(const U8 *buf, const U8* buf_end)