In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/3ef6b8e9a9da2a3d97ef32e4df629373ca2ab5f9?hp=d9c672b1f02c5ff634d77faf243344343bb4aaea>

- Log -----------------------------------------------------------------
commit 3ef6b8e9a9da2a3d97ef32e4df629373ca2ab5f9
Author: Jarkko Hietaniemi <[email protected]>
Date:   Tue Nov 18 20:20:54 2014 -0500

    Try making gcc happy about casting U32 to void*.
    
    util.c: In function ‘I32 Perl_xs_handshake(U32, void*, const char*, 
...)’:
    util.c:5389:39: warning: cast to pointer from integer of different size 
[-Wint-to-pointer-cast]
-----------------------------------------------------------------------

Summary of changes:
 util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util.c b/util.c
index 35ab087..d1a13a2 100644
--- a/util.c
+++ b/util.c
@@ -5386,9 +5386,9 @@ Perl_xs_handshake(const U32 key, void * v_my_perl, const 
char * file, ...)
     PERL_ARGS_ASSERT_XS_HANDSHAKE;
     va_start(args, file);
 
-    got = (void *)(key & HSm_KEY_MATCH);
+    got = INT2PTR(void*, (UV)(key & HSm_KEY_MATCH));
     need = (void *)(HS_KEY(FALSE, FALSE, "", "") & HSm_KEY_MATCH);
-    if(UNLIKELY(got != need))
+    if (UNLIKELY(got != need))
        goto bad_handshake;
 /* try to catch where a 2nd threaded perl interp DLL is loaded into a process
    by a XS DLL compiled against the wrong interl DLL b/c of bad @INC, and the

--
Perl5 Master Repository

Reply via email to