[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4277cf909103efff5773fdfa072f05dccb769c5b (commit)
      from  f9c693df45dc9948299c8c7ef02aa7648735bc4a (commit)


- Log -----------------------------------------------------------------
commit 4277cf909103efff5773fdfa072f05dccb769c5b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 17 22:23:09 2016 +0100

    Get conditional priorities right
    
    "or" has lower priority than "||" and works better to have Perl less
    confused.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index f8a1bda..688735b 100755
--- a/Configure
+++ b/Configure
@@ -1053,7 +1053,7 @@ if (!$no_asm) {
     $target{cpuid_asm_src}=$table{BASE}->{cpuid_asm_src} if ($config{processor} eq "386");
     $target{cpuid_asm_src}.=" uplink.c uplink-x86.s"
         if (grep { $_ eq "OPENSSL_USE_APPLINK"} @{$config{defines}}
-            || $config{cflags} =~ /(?:^|\s)-DOPENSSL_USE_APPLINK(?:\s|$)/);
+            or $config{cflags} =~ /(?:^|\s)-DOPENSSL_USE_APPLINK(?:\s|$)/);
 
     $target{bn_asm_src} =~ s/\w+-gf2m.c// if (defined($disabled{ec2m}));