archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 49321: [Backport #10752]

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/branches/ruby_2_2@49330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-01-19 03:04:49 +00:00
parent e8e1a374f0
commit 6222c2081d
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Mon Jan 19 12:00:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: get rid of pattern substitution, which is not * configure.in: get rid of pattern substitution, which is not

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.0" #define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-01-19" #define RUBY_RELEASE_DATE "2015-01-19"
#define RUBY_PATCHLEVEL 30 #define RUBY_PATCHLEVEL 31
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1

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;