From 2463b42e86af4c962a903e48ff7dfd9a05ec7b30 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Dec 2008 06:15:38 +0000
Subject: merges r20746 from trunk into ruby_1_9_1. * id.h, template/id.h.tmpl
 (ruby_method_ids): sees YYTOKENTYPE too.   [ruby-dev:37436]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 template/id.h.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template')

diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 5fc0c528db..643c711861 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -54,7 +54,7 @@ end
 #define symCFUNC ID2SYM(idCFUNC)
 
 enum ruby_method_ids {
-#ifndef tLAST_TOKEN
+#if !defined tLAST_TOKEN && !defined YYTOKENTYPE
 % tokens.each do |token, value|
     <%=token%> = <%=value%>,
 % end
-- 
cgit v1.2.3