summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--vm_dump.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 06a3837070..1866b1b904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 18 15:50:39 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]
+
Sun Jan 18 12:56:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (VPATH, NEWLINE_C), common.mk (common-srcs): make
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;