diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 09:34:43 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-29 09:34:43 +0000 |
commit | f1ab170ccd7a2bc6089889e4d61a8445a4a5152c (patch) | |
tree | 79c8a96d696a390d5e5865350a6d3b12191ef325 | |
parent | 716ed3d6305c06937dace66ac406131e27f62b1e (diff) |
merge revision(s) 17584:
* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
pointed by TOYOFUKU Chikanobu. [ruby-dev:35258]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | process.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 29 18:33:33 2008 Tanaka Akira <akr@fsij.org> + + * process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined. + pointed by TOYOFUKU Chikanobu. [ruby-dev:35258] + Sun Jun 29 18:26:01 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * variable.c (rb_f_trace_var): should not be allowed at safe level 4. @@ -42,7 +42,7 @@ struct timeval rb_time_interval _((VALUE)); #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif -#ifdef HAVE_GETPRIORITY +#ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif #include "st.h" @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 33 +#define RUBY_PATCHLEVEL 34 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |