summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 14:27:09 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-29 14:27:09 +0000
commit69b5469b2ce531b0c1b08c48dbb06f37f18bc9b0 (patch)
tree4487ca25a60e6a5642027b587fe3b61cb412d40e
parentcd58d6d4122a82e9cfaa53241036ad964a3b1b2a (diff)
* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@32291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/openssl/ossl.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 43ddc4b033..b50c6225dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 29 23:17:57 2011 WATANABE Hirofumi <[email protected]>
+
+ * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
Wed Jun 29 23:09:14 2011 WATANABE Hirofumi <[email protected]>
* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index d0edb7d5de..063ccef240 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -46,6 +46,7 @@ extern "C" {
#if defined(_WIN32)
# define OSSL_NO_CONF_API 1
+# define OPENSSL_SYS_WIN32 1
# ifdef USE_WINSOCK2
# include <winsock2.h>
# else