From 9cf7985893f33ba6f93b5b657c73e0ca289610cd Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 17 May 2017 05:38:37 +0000 Subject: [PATCH] Merge Onigmo 6.1.2 https://github.com/k-takata/Onigmo/commit/1364ae3488cac0acbf2d61ef3ce2b62fe0c0f528 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/onigmo.h | 2 +- tool/enc-unicode.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ruby/onigmo.h b/include/ruby/onigmo.h index 868372494b..99afcf66fa 100644 --- a/include/ruby/onigmo.h +++ b/include/ruby/onigmo.h @@ -39,7 +39,7 @@ extern "C" { #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 diff --git a/tool/enc-unicode.rb b/tool/enc-unicode.rb index baa05da496..ed45a30366 100755 --- a/tool/enc-unicode.rb +++ b/tool/enc-unicode.rb @@ -534,7 +534,7 @@ if header 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 }