From 0483bc835ac9d7a98c6221c31164adab28d45012 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Wed, 7 Apr 2004 21:33:13 +0000
Subject: merge local changes into perl-5.8.3

---
 gnu/usr.bin/perl/pp.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'gnu/usr.bin/perl/pp.c')

diff --git a/gnu/usr.bin/perl/pp.c b/gnu/usr.bin/perl/pp.c
index 4fec171ac97..1a304e454bd 100644
--- a/gnu/usr.bin/perl/pp.c
+++ b/gnu/usr.bin/perl/pp.c
@@ -106,12 +106,7 @@ PP(pp_padhv)
 	RETURNOP(do_kv());
     }
     else if (gimme == G_SCALAR) {
-	SV* sv = sv_newmortal();
-	if (HvFILL((HV*)TARG))
-	    Perl_sv_setpvf(aTHX_ sv, "%ld/%ld",
-		      (long)HvFILL((HV*)TARG), (long)HvMAX((HV*)TARG) + 1);
-	else
-	    sv_setiv(sv, 0);
+	SV* sv = Perl_hv_scalar(aTHX_ (HV*)TARG);
 	SETs(sv);
     }
     RETURN;
@@ -2796,8 +2791,7 @@ PP(pp_int)
 	      if (value > (NV)IV_MIN - 0.5) {
 		  SETi(I_V(value));
 	      } else {
-		/* This is maint, and we don't have Perl_ceil in perl.h  */
-		  SETn(-Perl_floor(-value));
+		  SETn(Perl_ceil(value));
 	      }
 	  }
       }
-- 
cgit v1.2.3