C99 math: lgamma and tgamma emulations.

[perl5.git] / pp_pack.c

diff --git a/pp_pack.c b/pp_pack.c
index 039bd26..40db6ef 100644 (file)
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -2083,10 +2083,10 @@ S_sv_exp_grow(pTHX_ SV *sv, STRLEN needed) {
 }
 
 static void
-S_sv_check_inf(pTHX_ SV *sv, I32 datumtype)
+S_sv_check_infnan(pTHX_ SV *sv, I32 datumtype)
 {
     SvGETMAGIC(sv);
-    if (UNLIKELY(Perl_isinfnansv(sv))) {
+    if (UNLIKELY(isinfnansv(sv))) {
        const I32 c = TYPE_NO_MODIFIERS(datumtype);
        const NV nv = SvNV_nomg(sv);
        if (c == 'w')
@@ -2096,8 +2096,8 @@ S_sv_check_inf(pTHX_ SV *sv, I32 datumtype)
     }
 }
 
-#define SvIV_no_inf(sv,d) (S_sv_check_inf(aTHX_ sv,d), SvIV_nomg(sv))
-#define SvUV_no_inf(sv,d) (S_sv_check_inf(aTHX_ sv,d), SvUV_nomg(sv))
+#define SvIV_no_inf(sv,d) (S_sv_check_infnan(aTHX_ sv,d), SvIV_nomg(sv))
+#define SvUV_no_inf(sv,d) (S_sv_check_infnan(aTHX_ sv,d), SvUV_nomg(sv))
 
 STATIC
 SV **
@@ -2857,7 +2857,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
             while (len-- > 0) {
                NV anv;
                fromstr = NEXTFROM;
-               S_sv_check_inf(fromstr, datumtype);
+               S_sv_check_infnan(aTHX_ fromstr, datumtype);
                anv = SvNV_nomg(fromstr);
 
                if (anv < 0) {
@@ -2874,7 +2874,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
                if (SvIOK(fromstr) || anv < UV_MAX_P1) {
                    char   buf[(sizeof(UV)*CHAR_BIT)/7+1];
                    char  *in = buf + sizeof(buf);
-                   UV     auv = SvUV(fromstr);
+                   UV     auv = SvUV_nomg(fromstr);
 
                    do {
                        *--in = (char)((auv & 0x7f) | 0x80);
@@ -2925,7 +2925,7 @@ S_pack_rec(pTHX_ SV *cat, tempsym_t* symptr, SV **beglist, SV **endlist )
 
                  w_string:
                    /* Copy string and check for compliance */
-                   from = SvPV_const(fromstr, len);
+                   from = SvPV_nomg_const(fromstr, len);
                    if ((norm = is_an_int(from, len)) == NULL)
                        Perl_croak(aTHX_ "Can only compress unsigned integers in pack");