nagachika	2015-11-25 01:09:58 +0900 (Wed, 25 Nov 2015)

  New Revision: 52743

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

  Log:
    merge revision(s) 52694: [Backport #3231]
    
    * ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in
    r52739.[Bug #3231]
    
    * ext/digest/rmd160/rmd160ossl.c: ditto.

  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/digest/rmd160/rmd160ossl.c
    branches/ruby_2_2/ext/digest/sha1/sha1ossl.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52742)
+++ ruby_2_2/ChangeLog	(revision 52743)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Nov 25 01:05:29 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in
+	  r52739.[Bug #3231]
+
+	* ext/digest/rmd160/rmd160ossl.c: ditto.
+
 Wed Nov 25 00:54:15 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (kwd_append): fix segv after invalid keyword argument,
Index: ruby_2_2/ext/digest/rmd160/rmd160ossl.c
===================================================================
--- ruby_2_2/ext/digest/rmd160/rmd160ossl.c	(revision 52742)
+++ ruby_2_2/ext/digest/rmd160/rmd160ossl.c	(revision 52743)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/rmd160/rmd160ossl.c#L1
 /* $Id$ */
 
-#include "defs.h"
+#include "../defs.h"
 #include "rmd160ossl.h"
 
 void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
Index: ruby_2_2/ext/digest/sha1/sha1ossl.c
===================================================================
--- ruby_2_2/ext/digest/sha1/sha1ossl.c	(revision 52742)
+++ ruby_2_2/ext/digest/sha1/sha1ossl.c	(revision 52743)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha1/sha1ossl.c#L1
 /* $Id$ */
 
-#include "defs.h"
+#include "../defs.h"
 #include "sha1ossl.h"
 
 void

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