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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b1979875e..9c793adde5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.  
diff --git a/process.c b/process.c
index c41924dbbf..0d16bb6e43 100644
--- a/process.c
+++ b/process.c
@@ -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"
diff --git a/version.h b/version.h
index 4114294a0e..7ef905f7c0 100644
--- a/version.h
+++ b/version.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