diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2023-06-07 03:44:07 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2023-06-19 01:57:09 +0900 |
| commit | 397ebbc62dafef02c9c47ea2d67fd31253f7b81b (patch) | |
| tree | 6cdc32f035d6ccd90564c294fbd3fcb2128abb8a /ext/openssl | |
| parent | bc0539a9b7538c5cb0c194cc0a700466cfa1b003 (diff) | |
| download | ruby-397ebbc62dafef02c9c47ea2d67fd31253f7b81b.tar.gz | |
[ruby/openssl] Drop support for Ruby 2.6
Ruby 2.6 has reached EOL on 2022-03. Requiring Ruby 2.7 allows us to
use C99 syntax.
https://github.com/ruby/openssl/commit/f6ba75e51e
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/openssl.gemspec | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl.c | 16 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 6 |
3 files changed, 1 insertions, 23 deletions
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec index 3a2f64f676..674dc20deb 100644 --- a/ext/openssl/openssl.gemspec +++ b/ext/openssl/openssl.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.extra_rdoc_files = Dir["*.md"] spec.rdoc_options = ["--main", "README.md"] - spec.required_ruby_version = ">= 2.6.0" + spec.required_ruby_version = ">= 2.7.0" spec.metadata["msys2_mingw_dependencies"] = "openssl" end diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c index 81069c8b93..c3b9f47a01 100644 --- a/ext/openssl/ossl.c +++ b/ext/openssl/ossl.c @@ -369,22 +369,6 @@ ossl_get_errors(VALUE _) */ VALUE dOSSL; -#if !defined(HAVE_VA_ARGS_MACRO) -void -ossl_debug(const char *fmt, ...) -{ - va_list args; - - if (dOSSL == Qtrue) { - fprintf(stderr, "OSSL_DEBUG: "); - va_start(args, fmt); - vfprintf(stderr, fmt, args); - va_end(args); - fprintf(stderr, " [CONTEXT N/A]\n"); - } -} -#endif - /* * call-seq: * OpenSSL.debug -> true | false diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index facb80aa73..8add914fd7 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -157,7 +157,6 @@ VALUE ossl_to_der_if_possible(VALUE); */ extern VALUE dOSSL; -#if defined(HAVE_VA_ARGS_MACRO) #define OSSL_Debug(...) do { \ if (dOSSL == Qtrue) { \ fprintf(stderr, "OSSL_DEBUG: "); \ @@ -166,11 +165,6 @@ extern VALUE dOSSL; } \ } while (0) -#else -void ossl_debug(const char *, ...); -#define OSSL_Debug ossl_debug -#endif - /* * Include all parts */ |