naruse	2015-01-19 12:04:49 +0900 (Mon, 19 Jan 2015)

  New Revision: 49330

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

  Log:
    merge revision(s) 49321: [Backport #10752]
    
    * vm_dump.c (rb_vm_bugreport): check by configured result instead
      of system name for old FreeBSD.  based on a patch by Steve Wills
      at [ruby-core:67655].  [Bug #10752]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_dump.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49329)
+++ ruby_2_2/ChangeLog	(revision 49330)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Jan 19 12:03:59 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm_dump.c (rb_vm_bugreport): check by configured result instead
+	  of system name for old FreeBSD.  based on a patch by Steve Wills
+	  at [ruby-core:67655].  [Bug #10752]
+
 Mon Jan 19 12:00:51 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: get rid of pattern substitution, which is not
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49329)
+++ ruby_2_2/version.h	(revision 49330)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-19"
-#define RUBY_PATCHLEVEL 30
+#define RUBY_PATCHLEVEL 31
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_2/vm_dump.c
===================================================================
--- ruby_2_2/vm_dump.c	(revision 49329)
+++ ruby_2_2/vm_dump.c	(revision 49330)
@@ -711,7 +711,7 @@ rb_print_backtrace(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_dump.c#L711
 #endif
 }
 
-#ifdef __FreeBSD__
+#ifdef HAVE_LIBPROCSTAT
 #include <sys/user.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
@@ -1033,7 +1033,7 @@ rb_vm_bugreport(const void *ctx) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm_dump.c#L1033
 	    }
 	}
 #endif /* __linux__ */
-#ifdef __FreeBSD__
+#ifdef HAVE_LIBPROCSTAT
 # define MIB_KERN_PROC_PID_LEN 4
 	int mib[MIB_KERN_PROC_PID_LEN];
 	struct kinfo_proc kp;

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49321


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