From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 22 Aug 2006 10:45:41 +0000 (+0300)
Subject: g++: fix Digest::MD5, Math::BigInt::FastCalc, ODBM_File, XS::APItest (and Time::HiRes... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a722a808f014b250085459c05169292bb4903ff;p=p5sagit%2Fp5-mst-13.2.git

g++: fix Digest::MD5, Math::BigInt::FastCalc, ODBM_File, XS::APItest (and Time::HiRes 1.88 in CPAN)
Message-Id: <200608220745.k7M7jfjP050939@kosh.hut.fi>

       ...plus various version bumps and Digest::MD5 test file fixes.

p4raw-id: //depot/perl@28744
---

diff --git a/ext/Digest/MD5/MD5.pm b/ext/Digest/MD5/MD5.pm
index 17fb11d..e9ff18e 100644
--- a/ext/Digest/MD5/MD5.pm
+++ b/ext/Digest/MD5/MD5.pm
@@ -3,7 +3,7 @@ package Digest::MD5;
 use strict;
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '2.36';  # $Date: 2005/11/30 13:46:47 $
+$VERSION = '2.36_01';  # $Date: 2005/11/30 13:46:47 $
 
 require Exporter;
 *import = \&Exporter::import;
diff --git a/ext/Digest/MD5/MD5.xs b/ext/Digest/MD5/MD5.xs
index c246338..3223c3d 100644
--- a/ext/Digest/MD5/MD5.xs
+++ b/ext/Digest/MD5/MD5.xs
@@ -713,8 +713,8 @@ md5(...)
 		}
 	    }
 	    if (msg) {
-		char *f = (ix == F_BIN) ? "md5" :
-                          (ix == F_HEX) ? "md5_hex" : "md5_base64";
+	        const char *f = (ix == F_BIN) ? "md5" :
+		                (ix == F_HEX) ? "md5_hex" : "md5_base64";
 	        warn("&Digest::MD5::%s function %s", f, msg);
 	    }
 	}
diff --git a/ext/Digest/MD5/t/files.t b/ext/Digest/MD5/t/files.t
index 1cec9b5..d2fb010 100644
--- a/ext/Digest/MD5/t/files.t
+++ b/ext/Digest/MD5/t/files.t
@@ -22,16 +22,16 @@ if (ord "A" == 193) { # EBCDIC
     $EXPECT = <<EOT;
 c7b68bb806b2d42f4a11511132e94ae8  Changes
 11e8028ee426273db6b6db270a8bb38c  README
-347d5b9f257eb62eaab60b3d952451f7  MD5.pm
-b61eb1bba8cc490040d02f6bf24874f7  MD5.xs
+c5e839f675f682215f913ea73788bc2c  MD5.pm
+9fedc2bc1f2346e42b1cfd54d697b91f  MD5.xs
 276da0aa4e9a08b7fe09430c9c5690aa  rfc1321.txt
 EOT
 } elsif ("\n" eq "\015") { # MacOS
     $EXPECT = <<EOT;
 628699b88b6a803225678802d2470067  Changes
 c95549c6c5e1e1c078b27042f1dc850f  README
-77503ff007841a671275fdf544dad68e  MD5.pm
-716c3278fd80338727c100e5d2a76795  MD5.xs
+e78ad7902025d17f140bef176dc4b154  MD5.pm
+2b1471867e79e05576f16daaaad53325  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 } else {
@@ -39,8 +39,8 @@ EOT
     $EXPECT = <<EOT;
 2fdc25c326960308f5334c967455d1f5  Changes
 c95549c6c5e1e1c078b27042f1dc850f  README
-77503ff007841a671275fdf544dad68e  MD5.pm
-716c3278fd80338727c100e5d2a76795  MD5.xs
+e78ad7902025d17f140bef176dc4b154  MD5.pm
+2b1471867e79e05576f16daaaad53325  MD5.xs
 754b9db19f79dbc4992f7166eb0f37ce  rfc1321.txt
 EOT
 }
diff --git a/ext/Math/BigInt/FastCalc/FastCalc.pm b/ext/Math/BigInt/FastCalc/FastCalc.pm
index e904e04..cda5b7c 100644
--- a/ext/Math/BigInt/FastCalc/FastCalc.pm
+++ b/ext/Math/BigInt/FastCalc/FastCalc.pm
@@ -11,7 +11,7 @@ use vars qw/@ISA $VERSION $BASE $BASE_LEN/;
 
 @ISA = qw(DynaLoader);
 
-$VERSION = '0.10';
+$VERSION = '0.10_01';
 
 bootstrap Math::BigInt::FastCalc $VERSION;
 
diff --git a/ext/Math/BigInt/FastCalc/FastCalc.xs b/ext/Math/BigInt/FastCalc/FastCalc.xs
index 6589962..f990171 100644
--- a/ext/Math/BigInt/FastCalc/FastCalc.xs
+++ b/ext/Math/BigInt/FastCalc/FastCalc.xs
@@ -388,15 +388,15 @@ _len(class,x)
   INIT:
     AV*	a;
     SV*	temp;
-    NV	elems;
+    IV	elems;
     STRLEN len;
 
   CODE:
     a = (AV*)SvRV(x);			/* ref to aray, don't check ref */
-    elems = (NV) av_len(a);		/* number of elems in array */
+    elems = av_len(a);			/* number of elems in array */
     temp = *av_fetch(a, elems, 0);	/* fetch last element */
     SvPV(temp, len);			/* convert to string & store length */
-    len += XS_BASE_LEN * elems;
+    len += (IV) XS_BASE_LEN * elems;
     ST(0) = newSViv(len);
 
 ##############################################################################
diff --git a/ext/ODBM_File/ODBM_File.pm b/ext/ODBM_File/ODBM_File.pm
index f76b444..044e493 100644
--- a/ext/ODBM_File/ODBM_File.pm
+++ b/ext/ODBM_File/ODBM_File.pm
@@ -7,7 +7,7 @@ require Tie::Hash;
 use XSLoader ();
 
 our @ISA = qw(Tie::Hash);
-our $VERSION = "1.06";
+our $VERSION = "1.07";
 
 XSLoader::load 'ODBM_File', $VERSION;
 
diff --git a/ext/ODBM_File/ODBM_File.xs b/ext/ODBM_File/ODBM_File.xs
index 695d392..e50e8df 100644
--- a/ext/ODBM_File/ODBM_File.xs
+++ b/ext/ODBM_File/ODBM_File.xs
@@ -15,7 +15,7 @@ int	dbminit(char* filename);
 int	dbmclose(void);
 datum	fetch(datum key);
 int	store(datum key, datum dat);
-int	delete(datum key);
+int	odelete(datum key); /* Cannot be delete() because of C++. */
 datum	firstkey(void);
 datum	nextkey(datum key);
 #endif
@@ -53,7 +53,7 @@ typedef datum datum_value ;
 
 #define odbm_FETCH(db,key)			fetch(key)
 #define odbm_STORE(db,key,value,flags)		store(key,value)
-#define odbm_DELETE(db,key)			delete(key)
+#define odbm_DELETE(db,key)			odelete(key)
 #define odbm_FIRSTKEY(db)			firstkey()
 #define odbm_NEXTKEY(db,key)			nextkey(key)
 
diff --git a/ext/XS/APItest/APItest.pm b/ext/XS/APItest/APItest.pm
index b9988c1..9591257 100644
--- a/ext/XS/APItest/APItest.pm
+++ b/ext/XS/APItest/APItest.pm
@@ -34,7 +34,7 @@ sub G_KEEPERR()	{  16 }
 sub G_NODEBUG()	{  32 }
 sub G_METHOD()	{  64 }
 
-our $VERSION = '0.09';
+our $VERSION = '0.10';
 
 bootstrap XS::APItest $VERSION;
 
diff --git a/ext/XS/APItest/APItest.xs b/ext/XS/APItest/APItest.xs
index 0bba0bb..0c5c517 100644
--- a/ext/XS/APItest/APItest.xs
+++ b/ext/XS/APItest/APItest.xs
@@ -78,7 +78,7 @@ test_freeent(freeent_function *f) {
        test expect to be able to call del_HE on the HE  */
     if (!PL_body_roots[HE_SVSLOT])
 	croak("PL_he_root is 0");
-    victim = PL_body_roots[HE_SVSLOT];
+    victim = (HE*) PL_body_roots[HE_SVSLOT];
     PL_body_roots[HE_SVSLOT] = HeNEXT(victim);
 #endif