From ced41b07dd6ebeaceb2a9be1d2bb6376eb7d0db4 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Thu, 8 Jan 2015 19:05:43 +0000 Subject: [PATCH] openssl: fix build failure on windows Backport of: https://github.com/openssl/openssl/commit/5c5e7e Original commit message: Fix build failure on Windows due to undefined cflags identifier Reviewed-by: Tim Hudson PR-URL: https://github.com/iojs/io.js/pull/289 Reviewed-By: Fedor Indutny --- deps/openssl/openssl/crypto/cversion.c | 2 +- deps/openssl/openssl/util/mkbuildinf.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/openssl/openssl/crypto/cversion.c b/deps/openssl/openssl/crypto/cversion.c index 0336adaa578..881957e8923 100644 --- a/deps/openssl/openssl/crypto/cversion.c +++ b/deps/openssl/openssl/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/deps/openssl/openssl/util/mkbuildinf.pl b/deps/openssl/openssl/util/mkbuildinf.pl index 9d7b81c76e4..ffa8a39933f 100755 --- a/deps/openssl/openssl/util/mkbuildinf.pl +++ b/deps/openssl/openssl/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