diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-10 17:47:04 +0000 |
commit | 2873edeafb6f6df1fc99bb9b1167591b99dd378c (patch) | |
tree | deb58ca3dc6d6cd71c1740e62aa7e47bea5ed37e /template/encdb.h.tmpl | |
parent | 42a677c895f82bcd611db2773fbe68b0558b142d (diff) |
Merge Onigmo 6.0.0
* https://github.com/k-takata/Onigmo/blob/Onigmo-6.0.0/HISTORY
* fix for ruby 2.4: https://github.com/k-takata/Onigmo/pull/78
* suppress warning: https://github.com/k-takata/Onigmo/pull/79
* include/ruby/oniguruma.h: include onigmo.h.
* template/encdb.h.tmpl: ignore duplicated definition of EUC-CN in
enc/euc_kr.c. It is defined in enc/gb2313.c with CRuby macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template/encdb.h.tmpl')
-rw-r--r-- | template/encdb.h.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/template/encdb.h.tmpl b/template/encdb.h.tmpl index 9cbb1f0083..9de29bebde 100644 --- a/template/encdb.h.tmpl +++ b/template/encdb.h.tmpl @@ -41,7 +41,8 @@ encdirs.each do |encdir| open(File.join(encdir,fn)) do |f| name = nil f.each_line do |line| - if (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line) + if (/^#ifndef RUBY/ =~ line)..(/^#endif/ =~ line) + elsif (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line) if $1 if name lines << %[ENC_SET_BASE("#$1", "#{name}");] |