[macruby-changes] [579] MacRuby/branches/testing

[source_changes at macosforge.org]

Revision: 579
          http://trac.macosforge.org/projects/ruby/changeset/579
Author:   lsansonetti at apple.com
Date:     2008-09-08 12:49:12 -0700 (Mon, 08 Sep 2008)
Log Message:
-----------
backport fixes from trunk

Modified Paths:
--------------
    MacRuby/branches/testing/Rakefile
    MacRuby/branches/testing/debug.h

Modified: MacRuby/branches/testing/Rakefile
===================================================================
--- MacRuby/branches/testing/Rakefile	2008-09-08 19:48:50 UTC (rev 578)
+++ MacRuby/branches/testing/Rakefile	2008-09-08 19:49:12 UTC (rev 579)
@@ -21,7 +21,7 @@
 NO_WARN_BUILD = !do_option('allow_build_warnings', false)
 BUILD_AS_EMBEDDABLE = do_option('build_as_embeddable', false)
 ENABLE_STATIC_LIBRARY = do_option('enable_static_library', 'no') { 'yes' }
-ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true)
+ENABLE_DEBUG_LOGGING = do_option('enable_debug_logging', true) { |x| x == 'true' }
 
 # TODO: we should find a way to document these options in rake's --help
 

Modified: MacRuby/branches/testing/debug.h
===================================================================
--- MacRuby/branches/testing/debug.h	2008-09-08 19:48:50 UTC (rev 578)
+++ MacRuby/branches/testing/debug.h	2008-09-08 19:49:12 UTC (rev 579)
@@ -29,8 +29,8 @@
 void  ruby_debug_breakpoint(void);
 void  ruby_debug_gc_check_func(void);
 
+#include "vm_core.h"
 #if ENABLE_DEBUG_LOGGING 
-# include "vm_core.h"
 # include <libgen.h>
 extern bool ruby_dlog_enabled;
 extern FILE *ruby_dlog_file;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080908/4dc91d2a/attachment.html