1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* gc.c (GC_PROFILE_MORE_DETAIL, CALC_EXACT_MALLOC_SIZE):

define macros only if they are not defined.
  fixes: [Ruby 1.9 - Feature #5291]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2011-09-09 23:34:05 +00:00
parent 6126c50add
commit 49042ae821
2 changed files with 11 additions and 0 deletions

View file

@ -1,3 +1,9 @@
Sat Sep 10 08:30:03 2011 Koichi Sasada <ko1@atdot.net>
* gc.c (GC_PROFILE_MORE_DETAIL, CALC_EXACT_MALLOC_SIZE):
define macros only if they are not defined.
fixes: [Ruby 1.9 - Feature #5291]
Sat Sep 10 08:25:47 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (bv_decls): parse.y relies on $$ = $1 before action

5
gc.c
View file

@ -93,7 +93,10 @@ static unsigned int initial_free_min = FREE_MIN;
int ruby_gc_debug_indent = 0;
/* for GC profile */
#ifndef GC_PROFILE_MORE_DETAIL
#define GC_PROFILE_MORE_DETAIL 0
#endif
typedef struct gc_profile_record {
double gc_time;
double gc_mark_time;
@ -309,7 +312,9 @@ struct gc_list {
struct gc_list *next;
};
#ifndef CALC_EXACT_MALLOC_SIZE
#define CALC_EXACT_MALLOC_SIZE 0
#endif
typedef struct rb_objspace {
struct {