merge revision(s) 40664:

nagachika · nagachika · commit 25e5b66798e1 · 2013-05-12T13:43:02.000Z
* signal.c (rb_f_kill): fixes typo. s/HAS_KILLPG/HAVE_KILLPG/.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 12 22:42:25 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* signal.c (rb_f_kill): fixes typo. s/HAS_KILLPG/HAVE_KILLPG/.
+
 Sun May 12 04:23:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_peek_variable_name): treat invalid global, class,
diff --git a/signal.c b/signal.c
@@ -363,7 +363,7 @@ ruby_default_signal(int sig)
 VALUE
 rb_f_kill(int argc, VALUE *argv)
 {
-#ifndef HAS_KILLPG
+#ifndef HAVE_KILLPG
 #define killpg(pg, sig) kill(-(pg), (sig))
 #endif
     int negative = 0;
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-05-12"
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 5

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ ruby_default_signal(int sig)`
`363`	`363`	`VALUE`
`364`	`364`	`rb_f_kill(int argc, VALUE *argv)`
`365`	`365`	`{`
`366`		`-#ifndef HAS_KILLPG`
	`366`	`+#ifndef HAVE_KILLPG`
`367`	`367`	`#define killpg(pg, sig) kill(-(pg), (sig))`
`368`	`368`	`#endif`
`369`	`369`	`int negative = 0;`