Merge branch 'blead' of camel:/gitroot/perl into blead

2 files changed, 6 insertions, 6 deletions

diff --git a/embed.fnc b/embed.fnc
index 1a053e825f..4a9d6ce1dd 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1830,6 +1830,7 @@ s	|void	|printbuf	|NN const char *const fmt|NN const char *const s
 
 #if defined(PERL_IN_UNIVERSAL_C) || defined(PERL_DECL_PROT)
 s	|bool|isa_lookup	|NN HV *stash|NN const char * const name
+so	|HV *	|get_isa_hash	|NN HV *const stash
 #endif
 
 #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
@@ -2218,7 +2219,6 @@ ApoM	|const char *|fetch_cop_label|NULLOK struct refcounted_he *const chain \
 : Only used  in op.c
 xpoM	|struct refcounted_he *|store_cop_label \
 		|NULLOK struct refcounted_he *const chain|NN const char *label
-so	|HV *	|get_isa_hash	|NN HV *const stash
 
 END_EXTERN_C
 /*
diff --git a/proto.h b/proto.h
index 1efa37ed99..d23ae7d120 100644
--- a/proto.h
+++ b/proto.h
@@ -5871,6 +5871,11 @@ STATIC bool	S_isa_lookup(pTHX_ HV *stash, const char * const name)
 #define PERL_ARGS_ASSERT_ISA_LOOKUP	\
 	assert(stash); assert(name)
 
+STATIC HV *	S_get_isa_hash(pTHX_ HV *const stash)
+			__attribute__nonnull__(pTHX_1);
+#define PERL_ARGS_ASSERT_GET_ISA_HASH	\
+	assert(stash)
+
 #endif
 
 #if defined(PERL_IN_LOCALE_C) || defined(PERL_DECL_PROT)
@@ -6649,11 +6654,6 @@ PERL_CALLCONV struct refcounted_he *	Perl_store_cop_label(pTHX_ struct refcounte
 #define PERL_ARGS_ASSERT_STORE_COP_LABEL	\
 	assert(label)
 
-STATIC HV *	S_get_isa_hash(pTHX_ HV *const stash)
-			__attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_GET_ISA_HASH	\
-	assert(stash)
-
 
 END_EXTERN_C
 /*