From b99775b163ce44079c1f8727ce9b4ed8bb03489d Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sun, 16 Feb 2020 15:21:29 +0900
Subject: Import openssl-2.2.0 (#2693)

Import the master branch of ruby/openssl for preparing to release openssl-2.2.0
---
 ext/openssl/deprecation.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'ext/openssl/deprecation.rb')

diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
index afe989ead1..6af7d562fb 100644
--- a/ext/openssl/deprecation.rb
+++ b/ext/openssl/deprecation.rb
@@ -1,9 +1,9 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module OpenSSL
   def self.deprecated_warning_flag
     unless flag = (@deprecated_warning_flag ||= nil)
       if try_compile("", flag = "-Werror=deprecated-declarations")
-        $warnflags = "#{@warnflags = $warnflags}" #{flag}"
+        $warnflags << " #{flag}"
       else
         flag = ""
       end
@@ -12,10 +12,6 @@ module OpenSSL
     flag
   end
 
-  def self.restore_warning_flag
-    $warnflags = @warnflags
-  end
-
   def self.check_func(func, header)
     have_func(func, header, deprecated_warning_flag)
   end
-- 
cgit v1.2.3