summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 edbe6165ef..57bc8d6d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 7 16:23:23 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl.h: need to include winsock2.h before including
+ windows.h by some openssl headers.
+
Mon Nov 7 13:43:51 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index f678ac1188..42578f7a75 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -31,6 +31,7 @@ extern "C" {
#if defined(_WIN32)
# define OpenFile WINAPI_OpenFile
# define OSSL_NO_CONF_API 1
+# include <winsock2.h>
#endif
#include <errno.h>
#include <openssl/err.h>