1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_dump.c: check by configured result

Browse Source 
* 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/trunk@49321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-18 06:50:41 +00:00
parent 00459aa89f
commit 6d2e8b0546
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Sun Jan 18 12:56:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (VPATH, NEWLINE_C), common.mk (common-srcs): make * Makefile.in (VPATH, NEWLINE_C), common.mk (common-srcs): make

4
vm_dump.c
View File

@ -711,7 +711,7 @@ rb_print_backtrace(void)
#endif #endif
} }
#ifdef __FreeBSD__ #ifdef HAVE_LIBPROCSTAT
#include <sys/user.h> #include <sys/user.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/param.h> #include <sys/param.h>
@ -1033,7 +1033,7 @@ rb_vm_bugreport(const void *ctx)
} }
} }
#endif /* __linux__ */ #endif /* __linux__ */
#ifdef __FreeBSD__ #ifdef HAVE_LIBPROCSTAT
# define MIB_KERN_PROC_PID_LEN 4 # define MIB_KERN_PROC_PID_LEN 4
int mib[MIB_KERN_PROC_PID_LEN]; int mib[MIB_KERN_PROC_PID_LEN];
struct kinfo_proc kp; struct kinfo_proc kp;