diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 17:02:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-16 17:02:39 +0000 |
commit | 7bd638b7a4062d774da7c96d3e926733b6a103ad (patch) | |
tree | eb6ae831d53fa500bbaa87ee759bad7c3c990c4d | |
parent | ed86cd0536fd1e77a17d69bf30fe5ef531e182ca (diff) |
object.c: suppress warning
* object.c (rb_obj_alloc): suppress unused variable warning.
* tool/gen_dummy_probes.rb: define dtrace disabling macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | object.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | tool/gen_dummy_probes.rb | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -1686,12 +1686,14 @@ rb_obj_alloc(VALUE klass) klass); } +#if !defined(DTRACE_PROBES_DISABLED) || !DTRACE_PROBES_DISABLED if (RUBY_DTRACE_OBJECT_CREATE_ENABLED()) { const char * file = rb_sourcefile(); RUBY_DTRACE_OBJECT_CREATE(rb_class2name(klass), file ? file : "", rb_sourceline()); } +#endif obj = (*allocator)(klass); diff --git a/tool/gen_dummy_probes.rb b/tool/gen_dummy_probes.rb index 88ad2ca5bf..e7efbd6822 100644..100755 --- a/tool/gen_dummy_probes.rb +++ b/tool/gen_dummy_probes.rb @@ -1,4 +1,5 @@ #!/usr/bin/ruby +# -*- coding: us-ascii -*- text = ARGF.read text.upcase! @@ -7,7 +8,7 @@ text.upcase! text.gsub!(/^#PRAGMA.*$/, '') # replace the provider section with the start of the header file -text.gsub!(/PROVIDER RUBY \{/, "#ifndef\t_PROBES_H\n#define\t_PROBES_H") +text.gsub!(/PROVIDER RUBY \{/, "#ifndef\t_PROBES_H\n#define\t_PROBES_H\n#define DTRACE_PROBES_DISABLED 1\n") # finish up the #ifndef sandwich text.gsub!(/\};/, "#endif\t/* _PROBES_H */") |