summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-08 06:03:17 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-08 06:03:17 +0000
commit8de18f9cda17997c4831c15e74574c44a6100ff5 (patch)
treef5d50bf17cb569e2b565dd77caa91d1d6d38d5c0
parentfc22563658a795e5bbd316245caabae6ae0f4252 (diff)
* ext/openssl/ossl.h: include openssl/e_os2.h before checking the
defition of OPENSSL_SYS_WIN32. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/openssl/ossl.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e4700a064a..7f7c769d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 8 15:01:06 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl.h: include openssl/e_os2.h before checking the
+ defition of OPENSSL_SYS_WIN32.
+
Fri Jul 8 14:40:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index c97dc5ac51..97095f7d6f 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -45,6 +45,7 @@ extern "C" {
#endif
#if defined(_WIN32)
+# include <openssl/e_os2.h>
# define OSSL_NO_CONF_API 1
# if !defined(OPENSSL_SYS_WIN32)
# define OPENSSL_SYS_WIN32 1