mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* dir.c (glob_helper): use #ifdef instead of #if.
gcc's -Wundef option shows warning for undefined macro. * numeric.c (flo_is_finite_p): ditto. * vm_dump.c (rb_vmdebug_thread_dump_state): ditto. * vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1e55b27e2c
commit
68f55c4b35
5 changed files with 19 additions and 4 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
Thu Sep 4 17:44:40 2014 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
|
* dir.c (glob_helper): use #ifdef instead of #if.
|
||||||
|
gcc's -Wundef option shows warning for undefined macro.
|
||||||
|
|
||||||
|
* numeric.c (flo_is_finite_p): ditto.
|
||||||
|
|
||||||
|
* vm_dump.c (rb_vmdebug_thread_dump_state): ditto.
|
||||||
|
|
||||||
|
* vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0.
|
||||||
|
|
||||||
Thu Sep 4 03:57:46 2014 Eric Wong <e@80x24.org>
|
Thu Sep 4 03:57:46 2014 Eric Wong <e@80x24.org>
|
||||||
|
|
||||||
* man/ruby.1: spelling fix ("bellow" => "below") [ci-skip]
|
* man/ruby.1: spelling fix ("bellow" => "below") [ci-skip]
|
||||||
|
|
4
dir.c
4
dir.c
|
@ -1405,11 +1405,11 @@ glob_helper(
|
||||||
if (magical || recursive) {
|
if (magical || recursive) {
|
||||||
struct dirent *dp;
|
struct dirent *dp;
|
||||||
DIR *dirp;
|
DIR *dirp;
|
||||||
# if DOSISH
|
# ifdef DOSISH
|
||||||
char *plainname = 0;
|
char *plainname = 0;
|
||||||
# endif
|
# endif
|
||||||
IF_HAVE_HFS(int hfs_p);
|
IF_HAVE_HFS(int hfs_p);
|
||||||
# if DOSISH
|
# ifdef DOSISH
|
||||||
if (cur + 1 == end && (*cur)->type <= ALPHA) {
|
if (cur + 1 == end && (*cur)->type <= ALPHA) {
|
||||||
plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
|
plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
|
||||||
if (!plainname) return -1;
|
if (!plainname) return -1;
|
||||||
|
|
|
@ -1488,7 +1488,7 @@ flo_is_finite_p(VALUE num)
|
||||||
{
|
{
|
||||||
double value = RFLOAT_VALUE(num);
|
double value = RFLOAT_VALUE(num);
|
||||||
|
|
||||||
#if HAVE_ISFINITE
|
#ifdef HAVE_ISFINITE
|
||||||
if (!isfinite(value))
|
if (!isfinite(value))
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -474,6 +474,10 @@ typedef struct rb_vm_struct {
|
||||||
#define VM_DEBUG_BP_CHECK 0
|
#define VM_DEBUG_BP_CHECK 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef VM_DEBUG_VERIFY_METHOD_CACHE
|
||||||
|
#define VM_DEBUG_VERIFY_METHOD_CACHE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef struct rb_control_frame_struct {
|
typedef struct rb_control_frame_struct {
|
||||||
VALUE *pc; /* cfp[0] */
|
VALUE *pc; /* cfp[0] */
|
||||||
VALUE *sp; /* cfp[1] */
|
VALUE *sp; /* cfp[1] */
|
||||||
|
|
|
@ -432,7 +432,7 @@ rb_vmdebug_thread_dump_state(VALUE self)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(HAVE_BACKTRACE)
|
#if defined(HAVE_BACKTRACE)
|
||||||
# if HAVE_LIBUNWIND
|
# ifdef HAVE_LIBUNWIND
|
||||||
# undef backtrace
|
# undef backtrace
|
||||||
# define backtrace unw_backtrace
|
# define backtrace unw_backtrace
|
||||||
# elif defined(__APPLE__) && defined(__x86_64__)
|
# elif defined(__APPLE__) && defined(__x86_64__)
|
||||||
|
|
Loading…
Add table
Reference in a new issue