aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-01-10 13:04:15 -0500
committerMike DePaulo <mikedep333@gmail.com>2015-01-10 15:21:26 -0500
commit50ca778029d5847f8dec48594590d35015ed31d4 (patch)
treeec8895de51f0d189d34ad8f665f708d7e2ee7daa
parent0d28e60619a87ac1d427de70e1d51da46973e8c2 (diff)
downloadvcxsrv-1.15.2.2-xp+vc2013+x2go1.tar.gz
vcxsrv-1.15.2.2-xp+vc2013+x2go1.tar.bz2
vcxsrv-1.15.2.2-xp+vc2013+x2go1.zip
Fix OpenSSL build - upstream fix for #2091.15.2.2-xp+vc2013+x2go1
-rw-r--r--openssl/crypto/cversion.c2
-rw-r--r--openssl/util/mkbuildinf.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/openssl/crypto/cversion.c b/openssl/crypto/cversion.c
index 0336adaa5..881957e89 100644
--- a/openssl/crypto/cversion.c
+++ b/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/openssl/util/mkbuildinf.pl b/openssl/util/mkbuildinf.pl
index 9d7b81c76..ffa8a3993 100644
--- a/openssl/util/mkbuildinf.pl
+++ b/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