Change 33167 by [EMAIL PROTECTED] on 2008/02/01 14:04:12
Integrate:
[ 33004]
Avoid an unused argument in S_sv_2iuv_non_preserve() by using
conditional compilation to only pass it in if it's needed.
Affected files ...
... //depot/maint-5.10/perl/embed.fnc#8 integrate
... //depot/maint-5.10/perl/embed.h#5 integrate
... //depot/maint-5.10/perl/proto.h#6 integrate
... //depot/maint-5.10/perl/sv.c#7 integrate
Differences ...
==== //depot/maint-5.10/perl/embed.fnc#8 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#7~33166~ 2008-02-01 04:52:40.000000000 -0800
+++ perl/embed.fnc 2008-02-01 06:04:12.000000000 -0800
@@ -1501,7 +1501,11 @@
s |void |del_sv |NN SV *p
# endif
# if !defined(NV_PRESERVES_UV)
+# ifdef DEBUGGING
s |int |sv_2iuv_non_preserve |NN SV *sv|I32 numtype
+# else
+s |int |sv_2iuv_non_preserve |NN SV *sv
+# endif
# endif
sR |I32 |expect_number |NN char** pattern
#
==== //depot/maint-5.10/perl/embed.h#5 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#4~33166~ 2008-02-01 04:52:40.000000000 -0800
+++ perl/embed.h 2008-02-01 06:04:12.000000000 -0800
@@ -1481,9 +1481,15 @@
#endif
# endif
# if !defined(NV_PRESERVES_UV)
+# ifdef DEBUGGING
#ifdef PERL_CORE
#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
#endif
+# else
+#ifdef PERL_CORE
+#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
+#endif
+# endif
# endif
#ifdef PERL_CORE
#define expect_number S_expect_number
@@ -3788,9 +3794,15 @@
#endif
# endif
# if !defined(NV_PRESERVES_UV)
+# ifdef DEBUGGING
#ifdef PERL_CORE
#define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b)
#endif
+# else
+#ifdef PERL_CORE
+#define sv_2iuv_non_preserve(a) S_sv_2iuv_non_preserve(aTHX_ a)
+#endif
+# endif
# endif
#ifdef PERL_CORE
#define expect_number(a) S_expect_number(aTHX_ a)
==== //depot/maint-5.10/perl/proto.h#6 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#5~33166~ 2008-02-01 04:52:40.000000000 -0800
+++ perl/proto.h 2008-02-01 06:04:12.000000000 -0800
@@ -3978,9 +3978,15 @@
# endif
# if !defined(NV_PRESERVES_UV)
+# ifdef DEBUGGING
STATIC int S_sv_2iuv_non_preserve(pTHX_ SV *sv, I32 numtype)
__attribute__nonnull__(pTHX_1);
+# else
+STATIC int S_sv_2iuv_non_preserve(pTHX_ SV *sv)
+ __attribute__nonnull__(pTHX_1);
+
+# endif
# endif
STATIC I32 S_expect_number(pTHX_ char** pattern)
__attribute__warn_unused_result__
==== //depot/maint-5.10/perl/sv.c#7 (text) ====
Index: perl/sv.c
--- perl/sv.c#6~33157~ 2008-01-31 13:43:37.000000000 -0800
+++ perl/sv.c 2008-02-01 06:04:12.000000000 -0800
@@ -1830,10 +1830,13 @@
/* For sv_2nv these three cases are "SvNOK and don't bother casting" */
STATIC int
-S_sv_2iuv_non_preserve(pTHX_ register SV *sv, I32 numtype)
+S_sv_2iuv_non_preserve(pTHX_ register SV *sv
+# ifdef DEBUGGING
+ , I32 numtype
+# endif
+ )
{
dVAR;
- PERL_UNUSED_ARG(numtype); /* Used only under DEBUGGING? */
DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf"
NV=%"NVgf" inttype=%"UVXf"\n", SvPVX_const(sv), SvIVX(sv), SvNVX(sv),
(UV)numtype));
if (SvNVX(sv) < (NV)IV_MIN) {
(void)SvIOKp_on(sv);
@@ -2106,7 +2109,11 @@
1 1 already read UV.
so there's no point in sv_2iuv_non_preserve() attempting
to use atol, strtol, strtoul etc. */
+# ifdef DEBUGGING
sv_2iuv_non_preserve (sv, numtype);
+# else
+ sv_2iuv_non_preserve (sv);
+# endif
}
}
#endif /* NV_PRESERVES_UV */
End of Patch.
