From: Marcus Holland-Moritz <mhx-perl@gmx.net>
Date: Sat, 21 Jan 2006 15:31:06 +0000 (+0000)
Subject: Remove wrong cast to (void *), which fixes a gcc warning, and use
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2593c6c6ec6db0c4fc4ec479ff2dcc27740704c8;p=p5sagit%2Fp5-mst-13.2.git

Remove wrong cast to (void *), which fixes a gcc warning, and use
the return value of upg_version() at least once in the core.

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

diff --git a/pp_ctl.c b/pp_ctl.c
index 4761ded..4a13be0 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3091,7 +3091,7 @@ PP(pp_require)
 
 	sv = new_version(sv);
 	if (!sv_derived_from(PL_patchlevel, "version"))
-	    (void *)upg_version(PL_patchlevel);
+	    upg_version(PL_patchlevel);
 	if (cUNOP->op_first->op_type == OP_CONST && cUNOP->op_first->op_private & OPpCONST_NOVER) {
 	    if ( vcmp(sv,PL_patchlevel) < 0 )
 		DIE(aTHX_ "Perls since %"SVf" too modern--this is %"SVf", stopped",
diff --git a/util.c b/util.c
index 9895f26..abbf4ed 100644
--- a/util.c
+++ b/util.c
@@ -4183,8 +4183,7 @@ Perl_new_version(pTHX_ SV *ver)
 #ifdef SvVOK
     }
 #endif
-    upg_version(rv);
-    return rv;
+    return upg_version(rv);
 }
 
 /*