[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8d9fb8c8dbdaad8c7e6009c96618b17aac9662b9 (commit)
      from  dc110177defb6bd50cc2271f7e3590cc3ca04a52 (commit)


- Log -----------------------------------------------------------------
commit 8d9fb8c8dbdaad8c7e6009c96618b17aac9662b9
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 21 12:00:41 2016 +0000

    Fix no-seed
    
    Fix compilation with --strict-warnings and no-seed
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/evp/e_seed.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index f8523c3..6964b1e 100644
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -53,7 +53,9 @@
  */
 
 #include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_SEED
+#ifdef OPENSSL_NO_SEED
+NON_EMPTY_TRANSLATION_UNIT
+#else
 # include <openssl/evp.h>
 # include <openssl/err.h>
 # include <string.h>