ruby-changes:6187
From: shyouhei <ko1@a...>
Date: Sun, 29 Jun 2008 18:33:28 +0900 (JST)
Subject: [ruby-changes:6187] Ruby:r17698 (ruby_1_8_6): merge revision(s) 17584:
shyouhei 2008-06-29 18:33:11 +0900 (Sun, 29 Jun 2008) New Revision: 17698 Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/process.c branches/ruby_1_8_6/version.h Log: merge revision(s) 17584: * process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined. pointed by TOYOFUKU Chikanobu. [ruby-dev:35258] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17698&r2=17697&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17698&r2=17697&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/process.c?r1=17698&r2=17697&diff_format=u Index: ruby_1_8_6/process.c =================================================================== --- ruby_1_8_6/process.c (revision 17697) +++ ruby_1_8_6/process.c (revision 17698) @@ -42,7 +42,7 @@ #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" Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 17697) +++ ruby_1_8_6/ChangeLog (revision 17698) @@ -1,3 +1,8 @@ +Sun Jun 29 18:32:19 2008 Tanaka Akira <akr@f...> + + * 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 <matz@r...> * variable.c (rb_f_trace_var): should not be allowed at safe level 4. Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 17697) +++ ruby_1_8_6/version.h (revision 17698) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/