From a097cc2442437b27d2dc292ff8d86a2da7d731d4 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 09:33:11 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ process.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23d8bddad..73e95fa91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 29 18:32:19 2008 Tanaka Akira + + * process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined. + pointed by TOYOFUKU Chikanobu. [ruby-dev:35258] + Sun Jun 29 18:25:03 2008 Yukihiro Matsumoto * variable.c (rb_f_trace_var): should not be allowed at safe level 4. diff --git a/process.c b/process.c index 377fa5f3f..718b8ff67 100644 --- a/process.c +++ b/process.c @@ -42,7 +42,7 @@ struct timeval rb_time_interval _((VALUE)); #ifdef HAVE_SYS_WAIT_H # include #endif -#ifdef HAVE_GETPRIORITY +#ifdef HAVE_SYS_RESOURCE_H # include #endif #include "st.h" diff --git a/version.h b/version.h index 3365ea307..d562b484b 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-29" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080629 -#define RUBY_PATCHLEVEL 250 +#define RUBY_PATCHLEVEL 251 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit