In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/6ea11d8cdaa70c00dfcd58674da3c7f24266bbae?hp=fc7d284e21281f09ffa3eff9ee2e2317acbb2d70>

- Log -----------------------------------------------------------------
commit 6ea11d8cdaa70c00dfcd58674da3c7f24266bbae
Author: Lukas Mai <[email protected]>
Date:   Mon Feb 15 21:17:18 2016 +0100

    Revert "tweak NOT_REACHED in DEBUGGING builds"
    
    This reverts commit 5b48e25f83f62f48ea280c49b00302e063384348.
    
    The above commit breaks win32 builds:
    
        IO.xs(73) : error C2065: 'my_perl' : undeclared identifier
        IO.xs(73) : error C2223: left of '->IProc' must point to struct/union
    
    where dist/IO/IO.xs contains:
    
        69: static int
        70: not_here(const char *s)
        71: {
        72:     croak("%s not implemented on this architecture", s);
        73:     NORETURN_FUNCTION_END;
        74: }
    
    and perl.h contains:
    
        #  define NORETURN_FUNCTION_END NOT_REACHED;
-----------------------------------------------------------------------

Summary of changes:
 perl.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/perl.h b/perl.h
index a2ba5cd..c60aeef 100644
--- a/perl.h
+++ b/perl.h
@@ -3744,12 +3744,11 @@ int perl_tsa_mutex_unlock(perl_mutex* mutex)
    so pass it through to C lib as a last resort */
 #    define ASSUME(x) assert(x)
 #  endif
-#  define NOT_REACHED ASSUME(0)
 #else
 #  define ASSUME(x) assert(x)
-#  define NOT_REACHED abort()
 #endif
 
+#define NOT_REACHED ASSUME(0)
 
 /* Some unistd.h's give a prototype for pause() even though
    HAS_PAUSE ends up undefined.  This causes the #define

--
Perl5 Master Repository

Reply via email to