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

ruby-changes:43845

From: nagachika <ko1@a...>
Date: Tue, 16 Aug 2016 12:13:32 +0900 (JST)
Subject: [ruby-changes:43845] nagachika:r55918 (ruby_2_3): merge revision(s) 55523: [Backport #12524]

nagachika	2016-08-16 12:13:24 +0900 (Tue, 16 Aug 2016)

  New Revision: 55918

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55918

  Log:
    merge revision(s) 55523: [Backport #12524]
    
    * ext/digest/md5/md5ossl.h: Remove excess semicolons.
      Suppress warning on Solaris with Oracle Solaris Studio 12.
      [ruby-dev:49692] [Bug #12524]
    
    * ext/digest/md5/md5cc.h: ditto.
    
    * ext/digest/sha1/sha1cc.h: ditto.
    
    * ext/digest/sha1/sha1ossl.h: ditto.
    
    * ext/digest/sha2/sha2cc.h: ditto.
    
    * ext/digest/sha2/sha2ossl.h: ditto.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ext/digest/md5/md5cc.h
    branches/ruby_2_3/ext/digest/md5/md5ossl.h
    branches/ruby_2_3/ext/digest/sha1/sha1cc.h
    branches/ruby_2_3/ext/digest/sha1/sha1ossl.h
    branches/ruby_2_3/ext/digest/sha2/sha2cc.h
    branches/ruby_2_3/ext/digest/sha2/sha2ossl.h
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55917)
+++ ruby_2_3/version.h	(revision 55918)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55917)
+++ ruby_2_3/ChangeLog	(revision 55918)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Aug 16 12:01:35 2016  Naohisa Goto  <ngotogenome@g...>
+
+	* ext/digest/md5/md5ossl.h: Remove excess semicolons.
+	  Suppress warning on Solaris with Oracle Solaris Studio 12.
+	  [ruby-dev:49692] [Bug #12524]
+
+	* ext/digest/md5/md5cc.h: ditto.
+	* ext/digest/sha1/sha1cc.h: ditto.
+	* ext/digest/sha1/sha1ossl.h: ditto.
+	* ext/digest/sha2/sha2cc.h: ditto.
+	* ext/digest/sha2/sha2ossl.h: ditto.
+
 Tue Aug 16 11:51:52 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
Index: ruby_2_3/ext/digest/sha1/sha1ossl.h
===================================================================
--- ruby_2_3/ext/digest/sha1/sha1ossl.h	(revision 55917)
+++ ruby_2_3/ext/digest/sha1/sha1ossl.h	(revision 55918)
@@ -15,7 +15,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/sha1/sha1ossl.h#L15
 #endif
 #define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
 
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
 #undef SHA1_Finish
 #define SHA1_Finish rb_digest_SHA1_finish
 
Index: ruby_2_3/ext/digest/sha1/sha1cc.h
===================================================================
--- ruby_2_3/ext/digest/sha1/sha1cc.h	(revision 55917)
+++ ruby_2_3/ext/digest/sha1/sha1cc.h	(revision 55918)
@@ -5,8 +5,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/sha1/sha1cc.h#L5
 #define SHA1_DIGEST_LENGTH	CC_SHA1_DIGEST_LENGTH
 #define SHA1_CTX		CC_SHA1_CTX
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1);
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
 
 #undef SHA1_Update
 #undef SHA1_Finish
Index: ruby_2_3/ext/digest/sha2/sha2ossl.h
===================================================================
--- ruby_2_3/ext/digest/sha2/sha2ossl.h	(revision 55917)
+++ ruby_2_3/ext/digest/sha2/sha2ossl.h	(revision 55918)
@@ -20,8 +20,8 @@ typedef SHA512_CTX SHA384_CTX; https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/sha2/sha2ossl.h#L20
 #define SHA256_Finish rb_digest_SHA256_finish
 #define SHA384_Finish rb_digest_SHA384_finish
 #define SHA512_Finish rb_digest_SHA512_finish
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512);
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
 
 #endif
Index: ruby_2_3/ext/digest/sha2/sha2cc.h
===================================================================
--- ruby_2_3/ext/digest/sha2/sha2cc.h	(revision 55917)
+++ ruby_2_3/ext/digest/sha2/sha2cc.h	(revision 55918)
@@ -7,12 +7,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/sha2/sha2cc.h#L7
 
 #define SHA384_CTX		CC_SHA512_CTX
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256);
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384);
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512);
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512);
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
+static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512)
+static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
 
 
 #undef SHA256_Update
Index: ruby_2_3/ext/digest/md5/md5cc.h
===================================================================
--- ruby_2_3/ext/digest/md5/md5cc.h	(revision 55917)
+++ ruby_2_3/ext/digest/md5/md5cc.h	(revision 55918)
@@ -3,8 +3,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/md5/md5cc.h#L3
 
 #define MD5_BLOCK_LENGTH	CC_MD5_BLOCK_BYTES
 
-static DEFINE_UPDATE_FUNC_FOR_UINT(MD5);
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
+static DEFINE_UPDATE_FUNC_FOR_UINT(MD5)
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
 
 #undef MD5_Update
 #undef MD5_Finish
Index: ruby_2_3/ext/digest/md5/md5ossl.h
===================================================================
--- ruby_2_3/ext/digest/md5/md5ossl.h	(revision 55917)
+++ ruby_2_3/ext/digest/md5/md5ossl.h	(revision 55918)
@@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/digest/md5/md5ossl.h#L8
 
 #define MD5_BLOCK_LENGTH	MD5_CBLOCK
 
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5);
+static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
 #undef MD5_Finish
 #define MD5_Finish rb_digest_MD5_finish
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55523


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

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