[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  be1f4812111aa76f12db91d9059ead3b43314b4c (commit)
      from  4e3973b457d42172711e2c556362826b02c44169 (commit)


- Log -----------------------------------------------------------------
commit be1f4812111aa76f12db91d9059ead3b43314b4c
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 31 16:40:36 2016 +0100

    Mark VC templates correctly.
    
    VC-noCE-common and VC-WIN64-common were missing this line:
    
            template         => 1,
    
    Fixes GH#1809
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1811)

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

Summary of changes:
 Configurations/10-main.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 7c9b190..9b4c78f 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1295,6 +1295,7 @@ sub vms_info {
     },
     "VC-noCE-common" => {
         inherit_from     => [ "VC-common" ],
+        template         => 1,
         cflags           => add(picker(default => "-DUNICODE -D_UNICODE",
                                        debug   =>
                                        sub {
@@ -1331,6 +1332,7 @@ sub vms_info {
     },
     "VC-WIN64-common" => {
         inherit_from     => [ "VC-noCE-common" ],
+        template         => 1,
         ex_libs          => add(sub {
             my @ex_libs = ();
             push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);