From a18a4811a0713b0a2a9eadc7d7a74ca31e0d8da0 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 Dec 2010 11:05:52 +0000
Subject: [PATCH] * template/id.h.tmpl (ruby_method_ids): suppress warnings.  
 [ruby-dev:42730]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 template/id.h.tmpl | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d2ead7391..784d13b08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 10 20:05:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/id.h.tmpl (ruby_method_ids): suppress warnings.
+	  [ruby-dev:42730]
+
 Fri Dec 10 18:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
diff --git a/template/id.h.tmpl b/template/id.h.tmpl
index b91292a103..0a4693ec4c 100644
--- a/template/id.h.tmpl
+++ b/template/id.h.tmpl
@@ -101,13 +101,13 @@ enum ruby_method_ids {
     t__send__,
     tInitialize,
     tUScore,
-#if SUPPORT_JOKE
+#if defined SUPPORT_JOKE && SUPPORT_JOKE
     tBitblt,
     tAnswer,
 #endif
     tLAST_ID,
 #define TOKEN2ID(n) id##n = ((t##n<<ID_SCOPE_SHIFT)|ID_LOCAL)
-#if SUPPORT_JOKE
+#if defined SUPPORT_JOKE && SUPPORT_JOKE
     TOKEN2ID(Bitblt),
     TOKEN2ID(Answer),
 #endif