naruse	2017-05-17 14:38:37 +0900 (Wed, 17 May 2017)

  New Revision: 58768

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

  Log:
    Merge Onigmo 6.1.2
    
    https://github.com/k-takata/Onigmo/commit/1364ae3488cac0acbf2d61ef3ce2b62fe0c0f528

  Modified files:
    trunk/include/ruby/onigmo.h
    trunk/tool/enc-unicode.rb
Index: include/ruby/onigmo.h
===================================================================
--- include/ruby/onigmo.h	(revision 58767)
+++ include/ruby/onigmo.h	(revision 58768)
@@ -39,7 +39,7 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/onigmo.h#L39
 
 #define ONIGMO_VERSION_MAJOR   6
 #define ONIGMO_VERSION_MINOR   1
-#define ONIGMO_VERSION_TEENY   1
+#define ONIGMO_VERSION_TEENY   2
 
 #ifndef ONIG_EXTERN
 # ifdef RUBY_EXTERN
Index: tool/enc-unicode.rb
===================================================================
--- tool/enc-unicode.rb	(revision 58767)
+++ tool/enc-unicode.rb	(revision 58768)
@@ -534,7 +534,7 @@ if header https://github.com/ruby/ruby/blob/trunk/tool/enc-unicode.rb#L534
   IO.popen(%W[diff -DUSE_UNICODE_AGE_PROPERTIES #{fds[1].path} #{fds[0].path}], "r") {|age|
     IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f|
       f.each {|line|
-        line.gsub!(/\(int\)\(long\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
+        line.gsub!(/\(int\)\((?:long|size_t)\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
                    'uniname2ctype_offset(\1), ')
         puts line
       }

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