Convert utf8n_to_uvchr_error to macro

It was a macro, but had a long-name function as well.  This converts to
using two macros.

Author: khwilliamson

embed.fnc

@@ -3672,7 +3672,7 @@ AMTdp	|UV	|utf8n_to_uvchr |NN const U8 *s 			\
 				|STRLEN curlen				\
 				|NULLOK STRLEN *retlen			\
 				|const U32 flags
-AMTdp	|UV	|utf8n_to_uvchr_error					\
+ATdmp	|UV	|utf8n_to_uvchr_error					\
 				|NN const U8 *s 			\
 				|STRLEN curlen				\
 				|NULLOK STRLEN *retlen			\

embed.h

@@ -863,6 +863,7 @@
 # define utf8_to_bytes_new_pv(a,b,c)            Perl_utf8_to_bytes_new_pv(aTHX,a,b,c)
 # define utf8_to_bytes_overwrite(a,b)           Perl_utf8_to_bytes_overwrite(aTHX,a,b)
 # define utf8_to_bytes_temp_pv(a,b)             Perl_utf8_to_bytes_temp_pv(aTHX,a,b)
+# define utf8n_to_uvchr_error                   Perl_utf8n_to_uvchr_error
 # define utf8n_to_uvchr_msgs                    Perl_utf8n_to_uvchr_msgs
 # define uvchr_to_utf8(a,b)                     Perl_uvchr_to_utf8(aTHX,a,b)
 # define uvchr_to_utf8_flags(a,b,c)             Perl_uvchr_to_utf8_flags(aTHX,a,b,c)

proto.h

@@ -1285,25 +1285,6 @@ flag to suppress any warnings, and then examine the C<*errors> return.
 =for apidoc Amnh||UTF8_GOT_SUPER
 =for apidoc Amnh||UTF8_GOT_SURROGATE
 
-=cut
-
-Also implemented as a macro in utf8.h
-*/
-
-UV
-Perl_utf8n_to_uvchr_error(const U8 *s,
-                          STRLEN curlen,
-                          STRLEN *retlen,
-                          const U32 flags,
-                          U32 * errors)
-{
-    PERL_ARGS_ASSERT_UTF8N_TO_UVCHR_ERROR;
-
-    return utf8n_to_uvchr_msgs(s, curlen, retlen, flags, errors, NULL);
-}
-
-/*
-
 =for apidoc utf8n_to_uvchr_msgs
 
 THIS FUNCTION SHOULD BE USED IN ONLY VERY SPECIALIZED CIRCUMSTANCES.

utf8.c

@@ -156,8 +156,9 @@ typedef enum {
 
 #define utf8n_to_uvchr(s, len, lenp, flags)                                    \
                                 utf8n_to_uvchr_error(s, len, lenp, flags, 0)
-#define utf8n_to_uvchr_error(s, len, lenp, flags, errors)                      \
-                        utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0)
+
+#define Perl_utf8n_to_uvchr_error(s, len, lenp, flags, errors)                 \
+                    Perl_utf8n_to_uvchr_msgs(s, len, lenp, flags, errors, 0)
 
 #define utf16_to_utf8(p, d, bytelen, newlen)                                \
                             utf16_to_utf8_base(p, d, bytelen, newlen, 0, 1)