Change 34917 by [EMAIL PROTECTED] on 2008/11/26 11:57:59
Replace Perl_my() with a small shell script. er. macro.
Affected files ...
... //depot/perl/embed.fnc#632 edit
... //depot/perl/embed.h#769 edit
... //depot/perl/op.c#1025 edit
... //depot/perl/op.h#216 edit
... //depot/perl/proto.h#966 edit
Differences ...
==== //depot/perl/embed.fnc#632 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#631~34904~ 2008-11-24 10:48:43.000000000 -0800
+++ perl/embed.fnc 2008-11-26 03:57:59.000000000 -0800
@@ -530,7 +530,6 @@
EXp |OP* |mod |NULLOK OP* o|I32 type
p |int |mode_from_discipline|NULLOK const char* s|STRLEN len
Ap |const char* |moreswitches |NN const char* s
-p |OP* |my |NN OP* o
Ap |NV |my_atof |NN const char *s
#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) &&
!defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
Anp |char* |my_bcopy |NN const char* from|NN char* to|I32 len
==== //depot/perl/embed.h#769 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#768~34904~ 2008-11-24 10:48:43.000000000 -0800
+++ perl/embed.h 2008-11-26 03:57:59.000000000 -0800
@@ -494,9 +494,6 @@
#define mode_from_discipline Perl_mode_from_discipline
#endif
#define moreswitches Perl_moreswitches
-#ifdef PERL_CORE
-#define my Perl_my
-#endif
#define my_atof Perl_my_atof
#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) &&
!defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
#define my_bcopy Perl_my_bcopy
@@ -2810,9 +2807,6 @@
#define mode_from_discipline(a,b) Perl_mode_from_discipline(aTHX_ a,b)
#endif
#define moreswitches(a) Perl_moreswitches(aTHX_ a)
-#ifdef PERL_CORE
-#define my(a) Perl_my(aTHX_ a)
-#endif
#define my_atof(a) Perl_my_atof(aTHX_ a)
#if (!defined(HAS_MEMCPY) && !defined(HAS_BCOPY)) || (!defined(HAS_MEMMOVE) &&
!defined(HAS_SAFE_MEMCPY) && !defined(HAS_SAFE_BCOPY))
#define my_bcopy Perl_my_bcopy
==== //depot/perl/op.c#1025 (text) ====
Index: perl/op.c
--- perl/op.c#1024~34907~ 2008-11-24 22:28:40.000000000 -0800
+++ perl/op.c 2008-11-26 03:57:59.000000000 -0800
@@ -2152,14 +2152,6 @@
}
OP *
-Perl_my(pTHX_ OP *o)
-{
- PERL_ARGS_ASSERT_MY;
-
- return my_attrs(o, NULL);
-}
-
-OP *
Perl_sawparens(pTHX_ OP *o)
{
PERL_UNUSED_CONTEXT;
==== //depot/perl/op.h#216 (text) ====
Index: perl/op.h
--- perl/op.h#215~34907~ 2008-11-24 22:28:40.000000000 -0800
+++ perl/op.h 2008-11-26 03:57:59.000000000 -0800
@@ -614,6 +614,10 @@
cv_ckproto_len((cv), (gv), (p), (p) ? strlen(p) : 0)
#endif
+#ifdef PERL_CORE
+# define my(o) my_attrs((o), NULL)
+#endif
+
#ifdef USE_REENTRANT_API
#include "reentr.h"
#endif
==== //depot/perl/proto.h#966 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#965~34829~ 2008-11-12 21:47:34.000000000 -0800
+++ perl/proto.h 2008-11-26 03:57:59.000000000 -0800
@@ -1899,11 +1899,6 @@
#define PERL_ARGS_ASSERT_MORESWITCHES \
assert(s)
-PERL_CALLCONV OP* Perl_my(pTHX_ OP* o)
- __attribute__nonnull__(pTHX_1);
-#define PERL_ARGS_ASSERT_MY \
- assert(o)
-
PERL_CALLCONV NV Perl_my_atof(pTHX_ const char *s)
__attribute__nonnull__(pTHX_1);
#define PERL_ARGS_ASSERT_MY_ATOF \
End of Patch.
