shyouhei	2008-06-29 18:34:43 +0900 (Sun, 29 Jun 2008)

  New Revision: 17700

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/process.c
    branches/ruby_1_8_7/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_7/ChangeLog?r1=17700&r2=17699&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/process.c?r1=17700&r2=17699&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17700&r2=17699&diff_format=u

Index: ruby_1_8_7/process.c
===================================================================
--- ruby_1_8_7/process.c	(revision 17699)
+++ ruby_1_8_7/process.c	(revision 17700)
@@ -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_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17699)
+++ ruby_1_8_7/ChangeLog	(revision 17700)
@@ -1,3 +1,8 @@
+Sun Jun 29 18:33:33 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:26:01 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.  
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17699)
+++ ruby_1_8_7/version.h	(revision 17700)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/