From 6222c2081d10de3d8f0a5d44f44f9db1dfdc4423 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 19 Jan 2015 03:04:49 +0000
Subject: [PATCH] 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 version.h | 2 +-
 vm_dump.c | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7fe05e8cea..2a9b8d8352 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 19 12:03:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* configure.in: get rid of pattern substitution, which is not
diff --git a/version.h b/version.h
index b41ac5938e..f1ddd7067a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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
diff --git a/vm_dump.c b/vm_dump.c
index 10715c985e..da2e6a951d 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -711,7 +711,7 @@ rb_print_backtrace(void)
 #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)
 	    }
 	}
 #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;