mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
716ed3d630
commit
f1ab170ccd
3 changed files with 7 additions and 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue