diff options
author | marha <marha@users.sourceforge.net> | 2014-10-19 11:31:33 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:33:30 +0200 |
commit | a14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch) | |
tree | 6a0005fed0f248559139016a7310add07fcb62df /openssl/Configure | |
parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
download | vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2 vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip |
Update to openssl-1.0.1j
Diffstat (limited to 'openssl/Configure')
-rw-r--r-- | openssl/Configure | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/Configure b/openssl/Configure index 36844b7b2..6f0da761b 100644 --- a/openssl/Configure +++ b/openssl/Configure @@ -1767,6 +1767,9 @@ open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslcon print OUT "/* opensslconf.h */\n"; print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n"; +print OUT "#ifdef __cplusplus\n"; +print OUT "extern \"C\" {\n"; +print OUT "#endif\n"; print OUT "/* OpenSSL was configured with the following options: */\n"; my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; $openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; @@ -1871,6 +1874,9 @@ while (<IN>) { print OUT $_; } } close(IN); +print OUT "#ifdef __cplusplus\n"; +print OUT "}\n"; +print OUT "#endif\n"; close(OUT); rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h"; rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; |