[X2Go-Commits] [vcxsrv] 24/24: Fix OpenSSL build - upstream fix for #209

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 1.15.2.2-xp+vc2013+x2go1
in repository vcxsrv.

commit 50ca778029d5847f8dec48594590d35015ed31d4
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Jan 10 13:04:15 2015 -0500

    Fix OpenSSL build - upstream fix for #209
---
 openssl/crypto/cversion.c  |    2 +-
 openssl/util/mkbuildinf.pl |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openssl/crypto/cversion.c b/openssl/crypto/cversion.c
index 0336ada..881957e 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 9d7b81c..ffa8a39 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

--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git