diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-03-02 23:54:19 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-03-02 23:54:19 +0400 |
| commit | 78d245f5b21eede58e79138330690d63cf3d86f8 (patch) | |
| tree | 205a01d5009031b21706d5d0780099bba927a42c /src/node_dtrace.cc | |
| parent | 34bf6e46beb4b94e9ed3c51da8589d604f19bc4e (diff) | |
| parent | 47abdd9c43ae97ed11cb8cc4c770b43043718308 (diff) | |
Merge remote-tracking branch 'origin/v0.10'
Conflicts:
configure
lib/_stream_readable.js
lib/http.js
src/node_dtrace.cc
Diffstat (limited to 'src/node_dtrace.cc')
| -rw-r--r-- | src/node_dtrace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index 0b8db1e0709..a4b5645d151 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -287,7 +287,7 @@ void DTRACE_HTTP_CLIENT_RESPONSE(const FunctionCallbackInfo<Value>& args) { } -static int dtrace_gc_start(GCType type, GCCallbackFlags flags) { +int dtrace_gc_start(GCType type, GCCallbackFlags flags) { NODE_GC_START(type, flags); /* * We avoid the tail-call elimination of the USDT probe (which screws up @@ -297,7 +297,7 @@ static int dtrace_gc_start(GCType type, GCCallbackFlags flags) { } -static int dtrace_gc_done(GCType type, GCCallbackFlags flags) { +int dtrace_gc_done(GCType type, GCCallbackFlags flags) { NODE_GC_DONE(type, flags); return 0; } |