[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb (commit)
      from  103b171d8fc282ef435f8de9afbf7782e312961f (commit)


- Log -----------------------------------------------------------------
commit 5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jan 8 19:05:43 2015 +0000

    Fix build failure on Windows due to undefined cflags identifier
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/cversion.c  |    2 +-
 util/mkbuildinf.pl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/cversion.c b/crypto/cversion.c
index 0336ada..881957e 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
 	if (t == SSLEAY_CFLAGS)
 		{
 #ifdef CFLAGS
-		return(cflags);
+		return(CFLAGS);
 #else
 		return("compiler: information not available");
 #endif
diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl
index 9d7b81c..ffa8a39 100755
--- a/util/mkbuildinf.pl
+++ b/util/mkbuildinf.pl
@@ -7,7 +7,7 @@ $date = localtime();
 print <<"END_OUTPUT";
 #ifndef MK1MF_BUILD
     /* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
-    #define CFLAGS
+    #define CFLAGS cflags
     /*
      * Generate CFLAGS as an array of individual characters. This is a
      * workaround for the situation where CFLAGS gets too long for a C90 string