ko1	2011-09-10 08:34:05 +0900 (Sat, 10 Sep 2011)

  New Revision: 33243

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33243

  Log:
    * gc.c (GC_PROFILE_MORE_DETAIL, CALC_EXACT_MALLOC_SIZE):
      define macros only if they are not defined.
      fixes: [Ruby 1.9 - Feature #5291]

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33242)
+++ ChangeLog	(revision 33243)
@@ -1,3 +1,9 @@
+Sat Sep 10 08:30:03 2011  Koichi Sasada  <ko1@a...>
+
+	* 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@r...>
 
 	* parse.y (bv_decls): parse.y relies on $$ = $1 before action
Index: gc.c
===================================================================
--- gc.c	(revision 33242)
+++ gc.c	(revision 33243)
@@ -93,7 +93,10 @@
 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 *next;
 };
 
+#ifndef CALC_EXACT_MALLOC_SIZE
 #define CALC_EXACT_MALLOC_SIZE 0
+#endif
 
 typedef struct rb_objspace {
     struct {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/