merge revision(s) 44370: [Backport ruby#9576]

nurse · nurse · commit d5c45b5fb117 · 2014-03-01T09:02:36.000Z
hash.c: extra states

	* hash.c (rb_hash_reject): use words "extra states".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/hash.c b/hash.c
@@ -1178,7 +1178,7 @@ rb_hash_reject(VALUE hash)
 #endif
 	}
     }
-#if HASH_REJECT_COPY_MISC_ATTRIBUTES
+#if HASH_REJECT_COPY_EXTRA_STATES
     result = rb_hash_dup_empty(hash);
 #else
     result = rb_hash_new();
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-03-01"
-#define RUBY_PATCHLEVEL 78
+#define RUBY_PATCHLEVEL 79
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 3

Original file line number	Diff line number	Diff line change
`@@ -1178,7 +1178,7 @@ rb_hash_reject(VALUE hash)`
`1178`	`1178`	`#endif`
`1179`	`1179`	`}`
`1180`	`1180`	`}`
`1181`		`-#if HASH_REJECT_COPY_MISC_ATTRIBUTES`
	`1181`	`+#if HASH_REJECT_COPY_EXTRA_STATES`
`1182`	`1182`	`result = rb_hash_dup_empty(hash);`
`1183`	`1183`	`#else`
`1184`	`1184`	`result = rb_hash_new();`