summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:15:38 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:15:38 +0000
commit531aa2dfe32c7a0913ab179a05a8e330742c8da6 (patch)
treeb3ba4964096831ba91eaee8a4b9356845a337272 /template
parenta645353b6847d97468b062ea6e7505c35941a7db (diff)
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
-rw-r--r--template/id.h.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index 5fc0c528d..643c71186 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