nagachika	2013-09-12 01:24:30 +0900 (Thu, 12 Sep 2013)

  New Revision: 42913

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42913

  Log:
    merge revision(s) 42713: [Backport #8792]
    
    * configure.in (sys/pstat.h): fix missing header check for
      missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 42912)
+++ ruby_2_0_0/configure.in	(revision 42913)
@@ -1616,6 +1616,7 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L1616
 [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
 [hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
 [])
+AC_CHECK_HEADERS(sys/pstat.h)
 
 
 AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42912)
+++ ruby_2_0_0/ChangeLog	(revision 42913)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Sep 12 01:18:44 2013  Michal Rokos  <michal@r...>
+
+	* configure.in (sys/pstat.h): fix missing header check for
+	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]
+
 Thu Sep 12 01:02:56 2013  Benoit Daloze  <eregontp@g...>
 
 	* test/ruby/test_time.rb: use the in_timezone() helper
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42912)
+++ ruby_2_0_0/version.h	(revision 42913)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-09-12"
-#define RUBY_PATCHLEVEL 301
+#define RUBY_PATCHLEVEL 302
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42713


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