diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-04 02:35:15 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-10-28 11:34:25 +0900 |
| commit | 447c05f122441a98b78ad9bdf26747b270596e68 (patch) | |
| tree | 2c4882cfcfc83e1b908ccd36ed41ada4637972db /ext/openssl | |
| parent | 16a6bef901074c579e99a2cadc83232bf820a425 (diff) | |
| download | ruby-openssl-447c05f122441a98b78ad9bdf26747b270596e68.tar.gz | |
Don't check for assert.h
The Ruby core code uses assert.h without a guard. So, we can assume it
is always available.
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 57c512fe..a812e59d 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -33,7 +33,6 @@ end Logging::message "=== Checking for system dependent stuff... ===\n" have_library("nsl", "t_open") have_library("socket", "socket") -have_header("assert.h") Logging::message "=== Checking for required stuff... ===\n" result = pkg_config("openssl") && have_header("openssl/ssl.h") diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 00d0b1b6..5405c72e 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -17,18 +17,13 @@ mX509 = rb_define_module_under(mOSSL, "X509"); #endif +#include <assert.h> #include <ruby.h> #include <ruby/io.h> #include <ruby/thread.h> #include <openssl/opensslv.h> -#ifdef HAVE_ASSERT_H -# include <assert.h> -#else -# define assert(condition) -#endif - #if defined(_WIN32) && !defined(LIBRESSL_VERSION_NUMBER) # include <openssl/e_os2.h> # if !defined(OPENSSL_SYS_WIN32) |