aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-04 11:47:18 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-04 11:47:18 +0000
commit57831cebe13ed93a09e3659ce7e8425506fcc0ba (patch)
treed4a998409a81d927f09738245174b6e56ea61976
parentb618f011b7820d64c533c8d8e9fb99cc7bec121e (diff)
downloadruby-57831cebe13ed93a09e3659ce7e8425506fcc0ba.tar.gz
* process.c (Init_process): win32 has our own WNOHANG definition, so
remove unnecessary #ifdef guard. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13626 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--process.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index daabfc5e8c..a33ec9fef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 4 20:45:53 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * process.c (Init_process): win32 has our own WNOHANG definition, so
+ remove unnecessary #ifdef guard.
+
Thu Oct 4 20:17:19 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* array.c (rb_ary_permutation, rb_ary_product): support non C99
diff --git a/process.c b/process.c
index 0bdcb426e2..969221ea56 100644
--- a/process.c
+++ b/process.c
@@ -3799,7 +3799,6 @@ Init_process(void)
rb_mProcess = rb_define_module("Process");
-#if !defined(_WIN32) && !defined(DJGPP)
#ifdef WNOHANG
rb_define_const(rb_mProcess, "WNOHANG", INT2FIX(WNOHANG));
#else
@@ -3810,7 +3809,6 @@ Init_process(void)
#else
rb_define_const(rb_mProcess, "WUNTRACED", INT2FIX(0));
#endif
-#endif
rb_define_singleton_method(rb_mProcess, "exec", rb_f_exec, -1);
rb_define_singleton_method(rb_mProcess, "fork", rb_f_fork, 0);