diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-09 04:45:27 +0400 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-09 04:45:27 +0400 |
| commit | eadb4f56063ff27781323451987e181fe724ed21 (patch) | |
| tree | 79ded8c6211c5d027c752e2b6865325f3e71ab7c /src/node_dtrace.cc | |
| parent | 4b77bd39a40f1e9dbdd0c337159b496a7026949d (diff) | |
| parent | 5c832e44c3c61ad41506df0d283901aba6aea187 (diff) | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
deps/v8/src/preparser.cc
deps/v8/src/win32-math.h
doc/api/http.markdown
src/node_buffer.h
src/node_crypto.cc
src/node_file.cc
src/node_http_parser.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 e259cfbd06a..df1546c2391 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -42,9 +42,9 @@ #define NODE_NET_SERVER_CONNECTION_ENABLED() (0) #define NODE_NET_STREAM_END(arg0) #define NODE_NET_STREAM_END_ENABLED() (0) -#define NODE_NET_SOCKET_READ(arg0, arg1) +#define NODE_NET_SOCKET_READ(arg0, arg1, arg2, arg3, arg4) #define NODE_NET_SOCKET_READ_ENABLED() (0) -#define NODE_NET_SOCKET_WRITE(arg0, arg1) +#define NODE_NET_SOCKET_WRITE(arg0, arg1, arg2, arg3, arg4) #define NODE_NET_SOCKET_WRITE_ENABLED() (0) #define NODE_GC_START(arg0, arg1) #define NODE_GC_DONE(arg0, arg1) |