diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-09 23:34:05 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-09 23:34:05 +0000 |
| commit | 49042ae821cb15986ab92d030960ee84154ae8a7 (patch) | |
| tree | 59a142066a20a1443ae3dcdf5121611ec8c43629 | |
| parent | 6126c50add54b22325b2312cb50d9a69d441a85e (diff) | |
| download | ruby-49042ae821cb15986ab92d030960ee84154ae8a7.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gc.c | 5 |
2 files changed, 11 insertions, 0 deletions
@@ -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 @@ -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 { |