Change 34929 by [EMAIL PROTECTED] on 2008/11/26 20:53:23
pad_reset() is only used in pad.c, so can be static.
Protect the prototype of S_vdie() with #if defined (PERL_IN_UTIL_C)
Affected files ...
... //depot/perl/embed.fnc#642 edit
... //depot/perl/embed.h#779 edit
... //depot/perl/pad.c#129 edit
... //depot/perl/proto.h#976 edit
Differences ...
==== //depot/perl/embed.fnc#642 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#641~34927~ 2008-11-26 12:29:58.000000000 -0800
+++ perl/embed.fnc 2008-11-26 12:53:23.000000000 -0800
@@ -197,7 +197,9 @@
p |void |deprecate |NN const char *const s
p |void |deprecate_old |NN const char *const s
Afp |OP* |die |NULLOK const char* pat|...
+#if defined(PERL_IN_UTIL_C)
s |OP* |vdie |NULLOK const char* pat|NULLOK va_list* args
+#endif
p |OP* |die_where |NULLOK const char* message|STRLEN msglen
Ap |void |dounwind |I32 cxix
pmb |bool |do_aexec |NULLOK SV* really|NN SV** mark|NN SV** sp
@@ -669,7 +671,9 @@
pd |void |pad_leavemy
Apd |SV* |pad_sv |PADOFFSET po
pd |void |pad_free |PADOFFSET po
-pd |void |pad_reset
+#if defined(PERL_IN_PAD_C)
+sd |void |pad_reset
+#endif
pd |void |pad_swipe |PADOFFSET po|bool refadjust
p |void |peep |NULLOK OP* o
dopM |PerlIO*|start_glob |NN SV *tmpglob|NN IO *io
==== //depot/perl/embed.h#779 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#778~34927~ 2008-11-26 12:29:58.000000000 -0800
+++ perl/embed.h 2008-11-26 12:53:23.000000000 -0800
@@ -159,8 +159,12 @@
#define deprecate_old Perl_deprecate_old
#endif
#define die Perl_die
+#if defined(PERL_IN_UTIL_C)
#ifdef PERL_CORE
#define vdie S_vdie
+#endif
+#endif
+#ifdef PERL_CORE
#define die_where Perl_die_where
#endif
#define dounwind Perl_dounwind
@@ -646,7 +650,13 @@
#define pad_sv Perl_pad_sv
#ifdef PERL_CORE
#define pad_free Perl_pad_free
-#define pad_reset Perl_pad_reset
+#endif
+#if defined(PERL_IN_PAD_C)
+#ifdef PERL_CORE
+#define pad_reset S_pad_reset
+#endif
+#endif
+#ifdef PERL_CORE
#define pad_swipe Perl_pad_swipe
#define peep Perl_peep
#endif
@@ -2483,8 +2493,12 @@
#define deprecate(a) Perl_deprecate(aTHX_ a)
#define deprecate_old(a) Perl_deprecate_old(aTHX_ a)
#endif
+#if defined(PERL_IN_UTIL_C)
#ifdef PERL_CORE
#define vdie(a,b) S_vdie(aTHX_ a,b)
+#endif
+#endif
+#ifdef PERL_CORE
#define die_where(a,b) Perl_die_where(aTHX_ a,b)
#endif
#define dounwind(a) Perl_dounwind(aTHX_ a)
@@ -2980,7 +2994,13 @@
#define pad_sv(a) Perl_pad_sv(aTHX_ a)
#ifdef PERL_CORE
#define pad_free(a) Perl_pad_free(aTHX_ a)
-#define pad_reset() Perl_pad_reset(aTHX)
+#endif
+#if defined(PERL_IN_PAD_C)
+#ifdef PERL_CORE
+#define pad_reset() S_pad_reset(aTHX)
+#endif
+#endif
+#ifdef PERL_CORE
#define pad_swipe(a,b) Perl_pad_swipe(aTHX_ a,b)
#define peep(a) Perl_peep(aTHX_ a)
#endif
==== //depot/perl/pad.c#129 (text) ====
Index: perl/pad.c
--- perl/pad.c#128~34698~ 2008-11-02 13:12:59.000000000 -0800
+++ perl/pad.c 2008-11-26 12:53:23.000000000 -0800
@@ -1151,7 +1151,7 @@
* We avoid doing this until we can think of a Better Way.
* GSAR 97-10-29 */
void
-Perl_pad_reset(pTHX)
+S_pad_reset(pTHX)
{
dVAR;
#ifdef USE_BROKEN_PAD_RESET
==== //depot/perl/proto.h#976 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#975~34927~ 2008-11-26 12:29:58.000000000 -0800
+++ perl/proto.h 2008-11-26 12:53:23.000000000 -0800
@@ -538,7 +538,9 @@
PERL_CALLCONV OP* Perl_die(pTHX_ const char* pat, ...)
__attribute__format__null_ok__(__printf__,pTHX_1,pTHX_2);
+#if defined(PERL_IN_UTIL_C)
STATIC OP* S_vdie(pTHX_ const char* pat, va_list* args);
+#endif
PERL_CALLCONV OP* Perl_die_where(pTHX_ const char* message, STRLEN
msglen);
PERL_CALLCONV void Perl_dounwind(pTHX_ I32 cxix);
/* PERL_CALLCONV bool Perl_do_aexec(pTHX_ SV* really, SV** mark, SV** sp)
@@ -2383,7 +2385,9 @@
PERL_CALLCONV void Perl_pad_leavemy(pTHX);
PERL_CALLCONV SV* Perl_pad_sv(pTHX_ PADOFFSET po);
PERL_CALLCONV void Perl_pad_free(pTHX_ PADOFFSET po);
-PERL_CALLCONV void Perl_pad_reset(pTHX);
+#if defined(PERL_IN_PAD_C)
+STATIC void S_pad_reset(pTHX);
+#endif
PERL_CALLCONV void Perl_pad_swipe(pTHX_ PADOFFSET po, bool refadjust);
PERL_CALLCONV void Perl_peep(pTHX_ OP* o);
PERL_CALLCONV PerlIO* Perl_start_glob(pTHX_ SV *tmpglob, IO *io)
End of Patch.
