summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-07 07:25:25 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-07 07:25:25 +0000
commitd28de933fb52b17fcdc28867c4b83c268ce79a97 (patch)
tree367c907fc0010de8954b7d368ca2778418132281
parent7e4ab6fb6326480cb14c137fbcba4c6f3e2713c2 (diff)
downloadruby-d28de933fb52b17fcdc28867c4b83c268ce79a97.tar.gz
ruby-d28de933fb52b17fcdc28867c4b83c268ce79a97.tar.xz
ruby-d28de933fb52b17fcdc28867c4b83c268ce79a97.zip
* ext/openssl/ossl.h: need to include winsock2.h before including
windows.h by some openssl headers. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9513 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 edbe6165e..57bc8d6d9 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 f678ac118..42578f7a7 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>