From 1b7d03b9d0d60d4dede7d38739503e59a8b25d06 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Dec 2016 17:47:04 +0000
Subject: 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
---
 template/encdb.h.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'template')

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}");]
-- 
cgit v1.2.3