1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge Onigmo 6.1.2

Browse Source 
1364ae3488

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-05-17 05:38:37 +00:00
parent d9b9423ba8
commit 9cf7985893
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ruby/onigmo.h
View File

@ -39,7 +39,7 @@ extern "C" {
#define ONIGMO_VERSION_MAJOR 6 #define ONIGMO_VERSION_MAJOR 6
#define ONIGMO_VERSION_MINOR 1 #define ONIGMO_VERSION_MINOR 1
#define ONIGMO_VERSION_TEENY 1 #define ONIGMO_VERSION_TEENY 2
#ifndef ONIG_EXTERN #ifndef ONIG_EXTERN
# ifdef RUBY_EXTERN # ifdef RUBY_EXTERN

2
tool/enc-unicode.rb
View File

@ -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_AGE_PROPERTIES #{fds[1].path} #{fds[0].path}], "r") {|age|
IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f| IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f|
f.each {|line| 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), ') 'uniname2ctype_offset(\1), ')
puts line puts line
} }