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

1 files changed, 1 insertions, 1 deletions

diff --git a/id.h b/id.h
index 40aaf2254c..6120b6c9a9 100644
--- a/id.h
+++ b/id.h
@@ -32,7 +32,7 @@
 #define symCFUNC ID2SYM(idCFUNC)
 
 enum ruby_method_ids {
-#ifndef tLAST_TOKEN
+#if !defined tLAST_TOKEN && !defined YYTOKENTYPE
     tUPLUS = 321,
     tUMINUS = 322,
     tPOW = 323,