naruse	2012-11-22 18:03:43 +0900 (Thu, 22 Nov 2012)

  New Revision: 37801

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

  Log:
    * Makefile.in (probes.o): add -C to ignore #include in probes.d.
    
    * probes.d: include vm_opts.h instead of vm_core.h.
    
    * vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/probes.d
    trunk/vm_core.h
    trunk/vm_opts.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37800)
+++ ChangeLog	(revision 37801)
@@ -1,3 +1,11 @@
+Thu Nov 22 18:01:28 2012  NARUSE, Yui  <naruse@r...>
+
+	* Makefile.in (probes.o): add -C to ignore #include in probes.d.
+
+	* probes.d: include vm_opts.h instead of vm_core.h.
+
+	* vm_opts.h (VM_COLLECT_USAGE_DETAILS): move definition from vm_core.h.
+
 Thu Nov 22 17:45:17 2012  NARUSE, Yui  <naruse@r...>
 
 	* ext/nkf/nkf-utf8: Merge b0a6577a521d1bba5e19853f95d5c4b9be1072b5.
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 37800)
+++ vm_core.h	(revision 37801)
@@ -14,10 +14,6 @@
 
 #define RUBY_VM_THREAD_MODEL 2
 
-#ifndef VM_COLLECT_USAGE_DETAILS
-#define VM_COLLECT_USAGE_DETAILS 0
-#endif
-
 #include "ruby/ruby.h"
 #include "ruby/st.h"
 
Index: probes.d
===================================================================
--- probes.d	(revision 37800)
+++ probes.d	(revision 37801)
@@ -1,4 +1,4 @@
-#include "vm_core.h"
+#include "vm_opts.h"
 
 provider ruby {
   probe function__entry(const char *, const char *, const char *, int);
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37800)
+++ Makefile.in	(revision 37801)
@@ -350,7 +350,7 @@
 	fi; \
 	touch "$$stamp"
 	$(RM) $@
-	$(Q) $(DTRACE) -G -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
+	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
 
 # DTrace static library hacks described here:
 # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
Index: vm_opts.h
===================================================================
--- vm_opts.h	(revision 37800)
+++ vm_opts.h	(revision 37801)
@@ -49,4 +49,8 @@
 /* misc */
 #define SUPPORT_JOKE                 0
 
+#ifndef VM_COLLECT_USAGE_DETAILS
+#define VM_COLLECT_USAGE_DETAILS 0
+#endif
+
 #endif /* RUBY_VM_OPTS_H */

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