[前][次][番号順一覧][スレッド一覧]

ruby-changes:21794

From: emboss <ko1@a...>
Date: Sat, 26 Nov 2011 10:49:45 +0900 (JST)
Subject: [ruby-changes:21794] emboss:r33843 (trunk): * ext/openssl/extconf.rb: remove checks for available functions.

emboss	2011-11-26 10:49:36 +0900 (Sat, 26 Nov 2011)

  New Revision: 33843

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33843

  Log:
    * ext/openssl/extconf.rb: remove checks for available functions.
    * ext/openssl/missing.h: ditto.
      Thanks, Tim Mooney for reporting this!
      [Bug #5432] [ruby-core:40088]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/extconf.rb
    trunk/ext/openssl/ruby_missing.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33842)
+++ ChangeLog	(revision 33843)
@@ -1,3 +1,10 @@
+Sat Nov 26 10:47:50 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/extconf.rb: remove checks for available functions.
+	* ext/openssl/missing.h: ditto.
+	  Thanks, Tim Mooney for reporting this!
+	  [Bug #5432] [ruby-core:40088]
+
 Sat Nov 26 10:22:28 2011  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* ext/openssl/ossl_ssl.c: add comment on where to find implementation
Index: ext/openssl/ruby_missing.h
===================================================================
--- ext/openssl/ruby_missing.h	(revision 33842)
+++ ext/openssl/ruby_missing.h	(revision 33843)
@@ -25,17 +25,4 @@
 #define rb_io_t OpenFile
 #endif
 
-#ifndef HAVE_RB_STR_SET_LEN
-/* these methods should probably be backported to 1.8 */
-#define rb_str_set_len(str, length) do {	\
-	RSTRING(str)->ptr[(length)] = 0;		\
-	RSTRING(str)->len = (length);		\
-} while(0)
-#endif /* ! HAVE_RB_STR_SET_LEN */
-
-#ifndef HAVE_RB_BLOCK_CALL
-/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */
-#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, (arg1), (arg5), (arg6))
-#endif /* ! HAVE_RB_BLOCK_CALL */
-
 #endif /* _OSSL_RUBY_MISSING_H_ */
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 33842)
+++ ext/openssl/extconf.rb	(revision 33843)
@@ -65,8 +65,6 @@
   exit 1
 end
 
-%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
-
 message "=== Checking for OpenSSL features... ===\n"
 have_func("ERR_peek_last_error")
 have_func("ASN1_put_eoc")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]