merges r20285 from trunk into ruby_1_9_1.

* node.h (NOEX_MODFUNC): should be include NOEX_PRIVATE.
  [ruby-dev:37124]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index eff13a746..f8752de46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 19 14:14:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* node.h (NOEX_MODFUNC): should be include NOEX_PRIVATE. 
+	  [ruby-dev:37124]
+
 Wed Nov 19 03:01:04 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
diff --git a/node.h b/node.h
index 5ae28382b..358bbca49 100644
--- a/node.h
+++ b/node.h
@@ -468,7 +468,7 @@ typedef struct RNode {
 
 #define NOEX_UNDEF     NOEX_NOSUPER
 
-#define NOEX_MODFUNC   0x10
+#define NOEX_MODFUNC   0x12
 #define NOEX_SUPER     0x20
 #define NOEX_VCALL     0x40