From: Andy Lester <andy@petdance.com>
Date: Thu, 11 May 2006 21:54:10 +0000 (-0500)
Subject: Fixing embed.fnc
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4789ae7c0cb97d73668d156d061a31899da00712;p=p5sagit%2Fp5-mst-13.2.git

Fixing embed.fnc
Message-ID: <20060512025410.GA32709@petdance.com>

p4raw-id: //depot/perl@28175
---

diff --git a/embed.fnc b/embed.fnc
index 8c24a25..f37a720 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -761,7 +761,7 @@ Apd	|CV*	|sv_2cv		|NULLOK SV* sv|NN HV** st|NN GV** gvp|I32 lref
 Apd	|IO*	|sv_2io		|NN SV* sv
 #ifdef PERL_IN_SV_C
 s	|bool	|glob_2number	|NN GV* const gv
-s	|char*	|glob_2pv	|NN GV* const gv|NN STRLEN * const len
+s	|char*	|glob_2pv	|NN GV* const gv|NULLOK STRLEN * const len
 #endif
 Amb	|IV	|sv_2iv		|NN SV* sv
 Apd	|IV	|sv_2iv_flags	|NN SV* sv|I32 flags
diff --git a/proto.h b/proto.h
index f24304b..c59d5a7 100644
--- a/proto.h
+++ b/proto.h
@@ -2076,8 +2076,7 @@ STATIC bool	S_glob_2number(pTHX_ GV* const gv)
 			__attribute__nonnull__(pTHX_1);
 
 STATIC char*	S_glob_2pv(pTHX_ GV* const gv, STRLEN * const len)
-			__attribute__nonnull__(pTHX_1)
-			__attribute__nonnull__(pTHX_2);
+			__attribute__nonnull__(pTHX_1);
 
 #endif
 /* PERL_CALLCONV IV	sv_2iv(pTHX_ SV* sv)