It looks like the previous patch is working fine on UNIXish boxes,

but is failing on Windows.  Anyways sv_utf8_upgrade_nomg() is
a macro anyways, so moving the documentation to sv.h.

6 files changed, 15 insertions, 22 deletions

diff --git a/embed.fnc b/embed.fnc
index 033bb5b64a..9b2a2ad134 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1257,7 +1257,6 @@ AmdbR	|char*	|sv_pv		|NN SV *sv
 AmdbR	|char*	|sv_pvutf8	|NN SV *sv
 AmdbR	|char*	|sv_pvbyte	|NN SV *sv
 Amdb	|STRLEN	|sv_utf8_upgrade|NN SV *sv
-Amdb	|STRLEN	|sv_utf8_upgrade_nomg|NN SV *sv
 ApdM	|bool	|sv_utf8_downgrade|NN SV *const sv|const bool fail_ok
 Apd	|void	|sv_utf8_encode |NN SV *const sv
 ApdM	|bool	|sv_utf8_decode |NN SV *const sv
diff --git a/global.sym b/global.sym
index 9598d52cb8..fe26578fb3 100644
--- a/global.sym
+++ b/global.sym
@@ -663,7 +663,6 @@ Perl_sv_pv
 Perl_sv_pvutf8
 Perl_sv_pvbyte
 Perl_sv_utf8_upgrade
-Perl_sv_utf8_upgrade_nomg
 Perl_sv_utf8_downgrade
 Perl_sv_utf8_encode
 Perl_sv_utf8_decode
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index cf85505c37..3fb77545fb 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -25,7 +25,7 @@ unadorned names, but this support may be disabled in a future release.
 Perl was originally written to handle US-ASCII only (that is characters
 whose ordinal numbers are in the range 0 - 127).
 And documentation and comments may still use the term ASCII, when
-sometimes in fact the entire range from 0 - 256 is meant.
+sometimes in fact the entire range from 0 - 255 is meant.
 
 Note that Perl can be compiled and run under EBCDIC (See L<perlebcdic>)
 or ASCII.  Most of the documentation (and even comments in the code)
@@ -5134,6 +5134,16 @@ Like C<sv_setsv> but doesn't process magic.
 =for hackers
 Found in file sv.h
 
+=item sv_utf8_upgrade_nomg
+X<sv_utf8_upgrade_nomg>
+
+Like sv_utf8_upgrade, but doesn't do magic on C<sv>
+
+	STRLEN	sv_utf8_upgrade_nomg(NN SV *sv)
+
+=for hackers
+Found in file sv.h
+
 
 =back
 
@@ -6534,16 +6544,6 @@ use the Encode extension for that.
 =for hackers
 Found in file sv.c
 
-=item sv_utf8_upgrade_nomg
-X<sv_utf8_upgrade_nomg>
-
-Like sv_utf8_upgrade, but doesn't do magic on C<sv>
-
-	STRLEN	sv_utf8_upgrade_nomg(SV *sv)
-
-=for hackers
-Found in file sv.c
-
 =item sv_vcatpvf
 X<sv_vcatpvf>
 
diff --git a/proto.h b/proto.h
index bf5e1ac9bb..f1526352a9 100644
--- a/proto.h
+++ b/proto.h
@@ -3969,11 +3969,6 @@ PERL_CALLCONV void	Perl_reginitcolors(pTHX);
 #define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE	\
 	assert(sv)
 
-/* PERL_CALLCONV STRLEN	Perl_sv_utf8_upgrade_nomg(pTHX_ SV *sv)
-			__attribute__nonnull__(pTHX_1); */
-#define PERL_ARGS_ASSERT_SV_UTF8_UPGRADE_NOMG	\
-	assert(sv)
-
 PERL_CALLCONV bool	Perl_sv_utf8_downgrade(pTHX_ SV *const sv, const bool fail_ok)
 			__attribute__nonnull__(pTHX_1);
 #define PERL_ARGS_ASSERT_SV_UTF8_DOWNGRADE	\
diff --git a/sv.c b/sv.c
index 917c897eaa..cfae3b7cd4 100644
--- a/sv.c
+++ b/sv.c
@@ -3154,10 +3154,6 @@ Returns the number of bytes in the converted string
 This is not as a general purpose byte encoding to Unicode interface:
 use the Encode extension for that.
 
-=for apidoc sv_utf8_upgrade_nomg
-
-Like sv_utf8_upgrade, but doesn't do magic on C<sv>
-
 =for apidoc sv_utf8_upgrade_flags
 
 Converts the PV of an SV to its UTF-8-encoded form.
diff --git a/sv.h b/sv.h
index 7a65fe83d9..a09a134c8f 100644
--- a/sv.h
+++ b/sv.h
@@ -1523,6 +1523,10 @@ Like C<sv_setsv> but doesn't process magic.
 =for apidoc Am|void|sv_catsv_nomg|SV* dsv|SV* ssv
 Like C<sv_catsv> but doesn't process magic.
 
+=for apidoc Amdb|STRLEN|sv_utf8_upgrade_nomg|NN SV *sv
+
+Like sv_utf8_upgrade, but doesn't do magic on C<sv>
+
 =cut
 */