aboutsummaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-09-04 02:48:33 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-10-28 11:34:48 +0900
commit8295165b3f5c7dac67149edc9e1ff8118a68a7ac (patch)
tree80e3d9136f6c638b7bad659b18851f9dedd450d7 /ext
parent66673c889d477a4e8aa42faeb5b54fbdbcd86ba7 (diff)
downloadruby-openssl-8295165b3f5c7dac67149edc9e1ff8118a68a7ac.tar.gz
Don't include openssl/e_os2.h
It defines the platform specific macros. But it should be included from other OpenSSL headers.
Diffstat (limited to 'ext')
-rw-r--r--ext/openssl/ossl.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 5405c72e..ad30cbf9 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -12,26 +12,12 @@
#include RUBY_EXTCONF_H
-#if 0
- mOSSL = rb_define_module("OpenSSL");
- mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
#include <assert.h>
+#include <errno.h>
#include <ruby.h>
#include <ruby/io.h>
#include <ruby/thread.h>
-
#include <openssl/opensslv.h>
-
-#if defined(_WIN32) && !defined(LIBRESSL_VERSION_NUMBER)
-# include <openssl/e_os2.h>
-# if !defined(OPENSSL_SYS_WIN32)
-# define OPENSSL_SYS_WIN32 1
-# endif
-# include <winsock2.h>
-#endif
-#include <errno.h>
#include <openssl/err.h>
#include <openssl/asn1.h>
#include <openssl/x509v3.h>