Bug 593483 - Unbreak (real) dtrace. r=gal, a=NPOTB

This commit is contained in:
Steve Fink 2010-09-16 13:21:12 -07:00
Родитель 356cd6b696
Коммит 0d598ad45e
2 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -853,7 +853,8 @@ $(CPPSRCS:%.cpp=%.$(OBJ_SUFFIX)): $(CURDIR)/jsautokw.h $(CURDIR)/jsautooplen.h
ifdef HAVE_DTRACE ifdef HAVE_DTRACE
$(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d $(CURDIR)/javascript-trace.h: $(srcdir)/javascript-trace.d
dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in dtrace -h -s $(srcdir)/javascript-trace.d -o javascript-trace.h.in
sed 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \ sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
-e '/const/!s/char \*/const char */g' \
javascript-trace.h.in > javascript-trace.h javascript-trace.h.in > javascript-trace.h
# We can't automatically generate dependencies on auto-generated headers; # We can't automatically generate dependencies on auto-generated headers;

Просмотреть файл

@ -40,14 +40,14 @@
*/ */
provider javascript { provider javascript {
probe function__entry(char *, char *, char *); probe function__entry(const char *, const char *, const char *);
probe function__return(char *, char *, char *); probe function__return(const char *, const char *, const char *);
/* XXX must use unsigned longs here instead of uintptr_t for OS X /* XXX must use unsigned longs here instead of uintptr_t for OS X
(Apple radar: 5194316 & 5565198) */ (Apple radar: 5194316 & 5565198) */
probe object__create(char *, unsigned long); probe object__create(const char *, unsigned long);
probe object__finalize(char *, char *, unsigned long); probe object__finalize(const char *, const char *, unsigned long);
probe execute__start(char *, int); probe execute__start(const char *, int);
probe execute__done(char *, int); probe execute__done(const char *, int);
}; };
/* /*